diff options
author | Yorke Lee <yorkelee@google.com> | 2013-07-30 11:14:25 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2013-07-31 08:56:31 -0700 |
commit | 8e2a0682b3380be25cdc4e3fafc0731087055dc1 (patch) | |
tree | 8a8ce0dd60231f8a1198cb835e953108c080fd14 /res/layout | |
parent | e1bee07393f2473f4f8e03b05844f73889e2b1a1 (diff) |
Dialpad modifications to match the rest of the redlines
* Reduced size of star and pound keys
* Made star and pound key gray
* Add voicemail image view
* Add light versions of menu assets
* Renamed other menu assets to be more consistent
* Assign proper menu items to dialpad fragment
Change-Id: I67f2e7eecb177fc8ab7b4bc9b2855b385c622a7f
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/dialpad_key.xml | 9 | ||||
-rw-r--r-- | res/layout/new_dialpad.xml | 70 | ||||
-rw-r--r-- | res/layout/new_dialpad_fragment.xml | 8 | ||||
-rw-r--r-- | res/layout/new_phone_favorites_fragment.xml | 6 |
4 files changed, 70 insertions, 23 deletions
diff --git a/res/layout/dialpad_key.xml b/res/layout/dialpad_key.xml index eef12a12f..b204c20a2 100644 --- a/res/layout/dialpad_key.xml +++ b/res/layout/dialpad_key.xml @@ -17,15 +17,14 @@ <!-- A layout representing a single key in the dialpad --> <com.android.dialer.dialpad.DialpadKeyButton xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/dialpad_key" style="@style/DialtactsDialpadButtonStyle" android:clickable="true" > <TextView android:id="@+id/dialpad_key_number" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#33b5e5" - android:textSize="40dp" + android:textColor="@color/dialpad_primary_text_color" + android:textSize="@dimen/dialpad_key_numbers_size" android:fontFamily="sans-serif-light" android:layout_centerInParent="true" /> @@ -33,8 +32,8 @@ android:id="@+id/dialpad_key_letters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#aaaaaa" - android:textSize="11dp" + android:textColor="@color/dialpad_secondary_text_color" + android:textSize="@dimen/dialpad_key_letters_size" android:paddingRight="11dp" android:layout_alignBaseline="@id/dialpad_key_number" android:fontFamily="sans-serif-light" diff --git a/res/layout/new_dialpad.xml b/res/layout/new_dialpad.xml index e71d4edf0..60240bc3f 100644 --- a/res/layout/new_dialpad.xml +++ b/res/layout/new_dialpad.xml @@ -30,34 +30,82 @@ android:layoutDirection="ltr" > <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <include layout="@layout/dialpad_key" android:id="@+id/one"/> + android:layout_height="0px" + android:layout_weight="1"> + <com.android.dialer.dialpad.DialpadKeyButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/one" + style="@style/DialtactsDialpadButtonStyle" + android:clickable="true" > + <TextView + android:id="@+id/dialpad_key_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/dialpad_primary_text_color" + android:textSize="@dimen/dialpad_key_numbers_size" + android:fontFamily="sans-serif-light" + android:layout_centerInParent="true" /> + <ImageView + android:id="@+id/dialpad_key_voicemail" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_dial_action_vm" + android:paddingRight="11dp" + android:layout_alignBaseline="@id/dialpad_key_number" + android:baselineAlignBottom="true" + android:layout_alignParentRight="true" /> + </com.android.dialer.dialpad.DialpadKeyButton> <include layout="@layout/dialpad_key" android:id="@+id/two"/> <include layout="@layout/dialpad_key" android:id="@+id/three"/> </TableRow> <TableRow - android:layout_height="0px" - android:layout_weight="1"> + android:layout_height="0px" + android:layout_weight="1"> <include layout="@layout/dialpad_key" android:id="@+id/four"/> <include layout="@layout/dialpad_key" android:id="@+id/five"/> <include layout="@layout/dialpad_key" android:id="@+id/six"/> </TableRow> <TableRow - android:layout_height="0px" - android:layout_weight="1"> + android:layout_height="0px" + android:layout_weight="1"> <include layout="@layout/dialpad_key" android:id="@+id/seven"/> <include layout="@layout/dialpad_key" android:id="@+id/eight"/> <include layout="@layout/dialpad_key" android:id="@+id/nine"/> </TableRow> <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <include layout="@layout/dialpad_key" android:id="@+id/star"/> + android:layout_height="0px" + android:layout_weight="1"> + <com.android.dialer.dialpad.DialpadKeyButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/star" + style="@style/DialtactsDialpadButtonStyle" + android:clickable="true" > + <TextView + android:id="@id/dialpad_key_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/dialpad_secondary_text_color" + android:textSize="@dimen/dialpad_key_special_characters_size" + android:fontFamily="sans-serif-light" + android:layout_centerInParent="true" /> + </com.android.dialer.dialpad.DialpadKeyButton> <include layout="@layout/dialpad_key" android:id="@+id/zero"/> - <include layout="@layout/dialpad_key" android:id="@+id/pound"/> + <com.android.dialer.dialpad.DialpadKeyButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/pound" + style="@style/DialtactsDialpadButtonStyle" + android:clickable="true" > + <TextView + android:id="@id/dialpad_key_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/dialpad_secondary_text_color" + android:textSize="@dimen/dialpad_key_special_characters_size" + android:fontFamily="sans-serif-light" + android:layout_centerInParent="true" /> + </com.android.dialer.dialpad.DialpadKeyButton> </TableRow> </TableLayout> diff --git a/res/layout/new_dialpad_fragment.xml b/res/layout/new_dialpad_fragment.xml index c357d4752..f6f652caa 100644 --- a/res/layout/new_dialpad_fragment.xml +++ b/res/layout/new_dialpad_fragment.xml @@ -85,9 +85,9 @@ android:layout_height="@dimen/fake_action_bar_height" android:layout_width="@dimen/fake_menu_button_min_width" android:layout_gravity="bottom|start" - android:background="?android:attr/selectableItemBackground" + android:background="@drawable/btn_call" android:contentDescription="@string/action_menu_call_history_description" - android:src="@drawable/ic_dialer_menu_history_dk"/> + android:src="@drawable/ic_menu_history_lt"/> <ImageButton android:id="@+id/dialButton" android:layout_width="0dp" @@ -103,8 +103,8 @@ android:layout_height="@dimen/fake_action_bar_height" android:layout_width="@dimen/fake_menu_button_min_width" android:layout_gravity="bottom|end" - android:background="?android:attr/selectableItemBackground" - android:src="@drawable/ic_menu_overflow_dark" + android:background="@drawable/btn_call" + android:src="@drawable/ic_menu_overflow_lt" android:contentDescription="@string/action_menu_overflow_description" /> </LinearLayout> diff --git a/res/layout/new_phone_favorites_fragment.xml b/res/layout/new_phone_favorites_fragment.xml index cc11ea164..2b6bbe447 100644 --- a/res/layout/new_phone_favorites_fragment.xml +++ b/res/layout/new_phone_favorites_fragment.xml @@ -58,7 +58,7 @@ android:layout_gravity="bottom|start" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/action_menu_call_history_description" - android:src="@drawable/ic_dialer_menu_history_dk"/> + android:src="@drawable/ic_menu_history_dk"/> <ImageButton android:id="@+id/dialpad_button" android:layout_width="@dimen/fake_menu_button_min_width" @@ -66,13 +66,13 @@ android:layout_gravity="bottom|center" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/description_search_button" - android:src="@drawable/ic_dialer_menu_dialpad_dk"/> + android:src="@drawable/ic_menu_dialpad_dk"/> <ImageButton android:id="@+id/overflow_menu" android:layout_width="@dimen/fake_menu_button_min_width" android:layout_height="match_parent" android:layout_gravity="bottom|end" - android:src="@drawable/ic_menu_overflow_dark" + android:src="@drawable/ic_menu_overflow_dk" android:contentDescription="@string/action_menu_overflow_description" android:background="?android:attr/selectableItemBackground"/> </FrameLayout> |