Remove contact tab.
- remove contact list tab on phone UI
- show search button instead of voice mail button
-- uses temporary assets
- remove some layout xml and have dimen values instead
Bug: 4691486
Change-Id: Iec028849fa65079ac7d76a64baf1590fd4537c37
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index 2c14877..50bc2a9 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -14,9 +14,7 @@
limitations under the License.
-->
-<!-- Dialpad in the Contact app.
- -->
-
+<!-- Dialpad in the Phone app. -->
<com.android.phone.ButtonGridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialpad"
android:paddingLeft="7dp"
@@ -26,11 +24,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:layout_weight="1"
->
+ android:layout_weight="1">
+
<ImageButton android:id="@+id/one"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_1_no_vm"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -39,7 +37,7 @@
<ImageButton android:id="@+id/two"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_2"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -48,7 +46,7 @@
<ImageButton android:id="@+id/three"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_3"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -57,7 +55,7 @@
<ImageButton android:id="@+id/four"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_4"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -66,7 +64,7 @@
<ImageButton android:id="@+id/five"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_5"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -75,7 +73,7 @@
<ImageButton android:id="@+id/six"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_6"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -84,7 +82,7 @@
<ImageButton android:id="@+id/seven"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_7"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -93,7 +91,7 @@
<ImageButton android:id="@+id/eight"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_8"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -102,7 +100,7 @@
<ImageButton android:id="@+id/nine"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_9"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -111,7 +109,7 @@
<ImageButton android:id="@+id/star"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_star"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -120,7 +118,7 @@
<ImageButton android:id="@+id/zero"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_0"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -129,7 +127,7 @@
<ImageButton android:id="@+id/pound"
android:layout_width="88dp"
- android:layout_height="50dp"
+ android:layout_height="@dimen/dialpad_button_height"
android:src="@drawable/dial_num_pound"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
diff --git a/res/layout/voicemail_dial_delete.xml b/res/layout/dialpad_additional_buttons.xml
similarity index 68%
rename from res/layout/voicemail_dial_delete.xml
rename to res/layout/dialpad_additional_buttons.xml
index 384981c..a35fae6 100644
--- a/res/layout/voicemail_dial_delete.xml
+++ b/res/layout/dialpad_additional_buttons.xml
@@ -16,46 +16,43 @@
<!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/voicemailAndDialAndDelete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:id="@+id/dialpadAdditionalButtons"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dialpad_additional_buttons_height"
android:layout_gravity="center_horizontal"
android:layout_marginTop="6dip"
- android:layout_weight="1"
+ android:layout_weight="0.25"
android:orientation="horizontal">
- <!-- Onscreen "Voicemail" button.
- The width is 75 (from the mocks) + 12 of padding from the
- 9patch, total is 87.
- -->
- <ImageButton android:id="@+id/voicemailButton"
- android:layout_width="87dip"
- android:layout_height="50dip"
+ <!-- Onscreen "Search button -->
+ <ImageButton android:id="@+id/searchButton"
+ android:layout_width="0px"
+ android:layout_weight="0.25"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:state_enabled="false"
android:background="@drawable/btn_dial_voicemail"
android:contentDescription="@string/description_voicemail_button"
- android:src="@drawable/ic_dial_action_voice_mail" />
+ android:src="@drawable/ic_dial_action_search" />
- <!-- Onscreen "Dial" button, used on all platforms by
+ <!-- Onscreen "Dial" button, diused on all platforms by
default. Its usage can be disabled using resources (see
config.xml.) -->
<ImageButton android:id="@+id/dialButton"
- android:layout_width="116dip"
- android:layout_height="50dip"
+ android:layout_width="0px"
+ android:layout_weight="0.50"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:state_enabled="false"
android:background="@drawable/btn_dial_action"
android:contentDescription="@string/description_dial_button"
android:src="@drawable/ic_dial_action_call" />
- <!-- Onscreen "Backspace/Delete" button
- The width is 75 (from the mocks) + 12 of padding from the
- 9patch, total is 87.
- -->
+ <!-- Onscreen "Backspace/Delete" button -->
<ImageButton android:id="@+id/deleteButton"
- android:layout_width="87dip"
- android:layout_height="50dip"
+ android:layout_width="0px"
+ android:layout_weight="0.25"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:state_enabled="false"
android:background="@drawable/btn_dial_delete"
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index c516bd8..7601dfe 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -14,8 +14,6 @@
limitations under the License.
-->
-<!-- TODO (stopship) We don't want to specify a background color here. For now we just
-keep it because otherwise the dialer needs some imagination to use (white on white) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/top"
android:layout_width="match_parent"
@@ -28,29 +26,17 @@
It's type is set to NULL (to disable the IME keyboard) in the
java code.
-->
- <!-- TODO: Use a textAppearance to control the display of the number -->
<EditText android:id="@+id/digits"
android:layout_width="match_parent"
- android:layout_height="67dip"
+ android:layout_height="@dimen/dialpad_digits_height"
android:gravity="center"
- android:maxLines="1"
- android:scrollHorizontally="true"
- android:textSize="33sp"
- android:freezesText="true"
- android:background="@drawable/btn_dial_textfield"
- android:textColor="@color/dialer_button_text"
- android:focusableInTouchMode="true"
- android:editable="true"
- android:cursorVisible="false"
- android:layout_weight="0"
- android:contentDescription="@string/description_digits_edittext"
- />
+ android:textAppearance="@style/DialtactsDigitsTextAppearance" />
<!-- Keypad section -->
<include layout="@layout/dialpad" />
<!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
- <include layout="@layout/voicemail_dial_delete" />
+ <include layout="@layout/dialpad_additional_buttons" />
<!-- "Dialpad chooser" UI, shown only when the user brings up the
Dialer while a call is already in progress.
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index 675dcdb..445a332 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -32,13 +32,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
- <!-- Contacts -->
- <fragment
- android:id="@+id/contacts_fragment"
- class="com.android.contacts.list.DefaultContactBrowseListFragment"
- android:layout_height="match_parent"
- android:layout_width="match_parent" />
-
<!-- Favorites -->
<fragment
android:id="@+id/favorites_fragment"