Merge "Remove unused resources in Dialer"
diff --git a/res/drawable/background_all_contacts.xml b/res/drawable/background_all_contacts.xml
deleted file mode 100644
index c14886a..0000000
--- a/res/drawable/background_all_contacts.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="false">
- <shape android:shape="rectangle" >
- <solid android:color="@color/all_contacts_button_color" />
- </shape>
- </item>
-
- <item android:state_pressed="true">
- <shape android:shape="rectangle" >
- <solid android:color="@color/all_contacts_button_pressed_color" />
- </shape>
- </item>
-</selector>
\ No newline at end of file
diff --git a/res/layout/phone_favorites_menu.xml b/res/layout/phone_favorites_menu.xml
deleted file mode 100644
index 0f7aa21..0000000
--- a/res/layout/phone_favorites_menu.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-
-<!-- The phone favorites menu appears on the main dialer screen above the favorite callers area,
- and provides access to the All Contacts list. This is 1dp tall as a temporary hack to hide
- it because it is no longer being used. It should be removed from its parent adapter entirely
- eventually. -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/phone_favorites_menu"
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:paddingLeft="@dimen/favorites_menu_padding_horizontal"
- android:paddingRight="@dimen/favorites_menu_padding_horizontal"
- android:paddingTop="@dimen/favorites_menu_padding_top"
- android:paddingBottom="@dimen/favorites_menu_padding_bottom"
- android:background="@color/favorites_menu_background_color"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="@dimen/favorites_menu_speed_dial_height"
- android:fontFamily="@string/favorites_menu_speed_dial_font_family"
- android:text="@string/favorites_menu_speed_dial"
- android:textSize="@dimen/favorites_menu_speed_dial_text_size"
- android:textColor="@color/speed_dial_text_color"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:gravity="center"
- />
- <Button
- android:id="@+id/all_contacts_button"
- android:fontFamily="@string/favorites_menu_all_contacts_font_family"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/favorites_menu_all_contacts_height"
- android:paddingLeft="@dimen/favorites_menu_padding_horizontal"
- android:paddingRight="@dimen/favorites_menu_padding_horizontal"
- android:text="@string/favorites_menu_all_contacts"
- android:textSize="@dimen/favorites_menu_all_contacts_text_size"
- android:background="@drawable/background_all_contacts"
- android:textColor="@color/all_contacts_button_text_color"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:gravity="center"
- />
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c00ad6b..7d5ef71 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -88,21 +88,6 @@
<!-- Text color for the "Remove" text when a contact is dragged on top of the remove view -->
<color name="remove_highlighted_text_color">#FF3F3B</color>
- <!-- Text color for the "speed dial" label in the favorites menu. -->
- <color name="speed_dial_text_color">#555555</color>
-
- <!-- Background color for the "All Contacts" button in the favorites menu. -->
- <color name="all_contacts_button_color">#999999</color>
-
- <!-- Background color for the "All Contacts" button in the favorites menu when pressed. -->
- <color name="all_contacts_button_pressed_color">#808080</color>
-
- <!-- Background color for the favorites menu. -->
- <color name="favorites_menu_background_color">#eeeeee</color>
-
- <!-- Text color for the "All Contacts" button above the favorite callers -->
- <color name="all_contacts_button_text_color">#ffffff</color>
-
<!-- Color of the bottom border below the contacts grid on the main dialer screen. -->
<color name="contacts_grid_bottom_border_color">#16000000</color>
diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index 0399bf7..478327c 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -146,7 +146,6 @@
private PhoneFavoriteListView mListView;
- private View mPhoneFavoritesMenu;
private View mContactTileFrame;
private TileInteractionTeaserView mTileInteractionTeaserView;
@@ -211,8 +210,6 @@
mEmptyView = mParentView.findViewById(R.id.phone_no_favorites_view);
- mPhoneFavoritesMenu = inflater.inflate(R.layout.phone_favorites_menu, mListView, false);
-
mContactTileFrame = mParentView.findViewById(R.id.contact_tile_frame);
mTileInteractionTeaserView = (TileInteractionTeaserView) inflater.inflate(