diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/new_dialpad_fragment.xml | 26 | ||||
| -rw-r--r-- | res/layout/new_phone_favorites_fragment.xml | 4 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
4 files changed, 28 insertions, 9 deletions
diff --git a/res/layout/new_dialpad_fragment.xml b/res/layout/new_dialpad_fragment.xml index 4641e0091..2026781fe 100644 --- a/res/layout/new_dialpad_fragment.xml +++ b/res/layout/new_dialpad_fragment.xml @@ -73,26 +73,40 @@ <View style="@style/DialpadHorizontalSeparator"/> - <!-- left and right paddings will be modified by the code. See DialpadFragment. --> - <FrameLayout + <LinearLayout android:id="@+id/dialButtonContainer" android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="@integer/dialpad_layout_weight_additional_buttons" android:layout_gravity="center_horizontal" android:background="@color/dialpad_primary_text_color"> - + <ImageButton + android:id="@+id/call_history_on_dialpad_button" + 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:contentDescription="@string/action_menu_call_history_description" + android:src="@drawable/ic_dialer_menu_history_dk"/> <ImageButton android:id="@+id/dialButton" - android:layout_width="match_parent" + android:layout_width="0dp" + android:layout_weight="1" android:layout_height="match_parent" android:layout_gravity="center" android:state_enabled="false" android:background="@drawable/btn_call" android:contentDescription="@string/description_dial_button" android:src="@drawable/ic_dial_action_call" /> - - </FrameLayout> + <ImageButton + android:id="@+id/overflow_menu_on_dialpad" + 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:contentDescription="@string/action_menu_overflow_description" /> + </LinearLayout> <!-- "Dialpad chooser" UI, shown only when the user brings up the Dialer while a call is already in progress. diff --git a/res/layout/new_phone_favorites_fragment.xml b/res/layout/new_phone_favorites_fragment.xml index 90d0aacd2..9974adf65 100644 --- a/res/layout/new_phone_favorites_fragment.xml +++ b/res/layout/new_phone_favorites_fragment.xml @@ -46,7 +46,7 @@ android:textAppearance="?android:attr/textAppearanceLarge"/> </FrameLayout> <FrameLayout - android:layout_height="48dp" + android:layout_height="@dimen/fake_action_bar_height" android:layout_width="match_parent" android:id="@+id/fake_action_bar" android:background="@color/actionbar_background_color"> @@ -56,7 +56,7 @@ android:layout_height="match_parent" android:layout_gravity="bottom|start" android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/description_search_button" + android:contentDescription="@string/action_menu_call_history_description" android:src="@drawable/ic_dialer_menu_history_dk"/> <ImageButton android:id="@+id/dialpad_button" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 0ab27c311..e9f2ce0ed 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -49,8 +49,9 @@ <integer name="dialpad_layout_weight_dialpad">65</integer> <integer name="dialpad_layout_weight_additional_buttons">15</integer> + <dimen name="fake_action_bar_height">48dp</dimen> <!-- Min with of fake menu buttons, which should be same as ActionBar's one --> - <dimen name="fake_menu_button_min_width">56dip</dimen> + <dimen name="fake_menu_button_min_width">56dp</dimen> <!-- Smart Dial --> <dimen name="smartdial_suggestions_padding">4dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8b7d61a1a..c7e1b869d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -302,6 +302,10 @@ --> <string name="description_digits_edittext">number to dial</string> + <!-- Content description for the fake action menu button that brings up the call history + activity --> + <string name="action_menu_call_history_description">Call History</string> + <!-- Content description for the fake action menu overflow button. This should be same as the description for the real action menu overflow button available in ActionBar. |