diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-07-27 00:11:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-27 00:11:40 +0000 |
| commit | fca42086a510778d951fe1d5d80f35223f9d7a0d (patch) | |
| tree | 0f0c3895743de46654ca64b2110288656631e5ca /res/layout | |
| parent | 5fe874fbdfe0010b5f2439cf6c13eaee46d406ea (diff) | |
| parent | 714d6c7112626055d17ded8c58e76ee018f37bfe (diff) | |
| download | android_packages_apps_Dialer-fca42086a510778d951fe1d5d80f35223f9d7a0d.tar.gz android_packages_apps_Dialer-fca42086a510778d951fe1d5d80f35223f9d7a0d.tar.bz2 android_packages_apps_Dialer-fca42086a510778d951fe1d5d80f35223f9d7a0d.zip | |
Merge "Add actionbar items on dialpad fragment to match redlines"
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/new_dialpad_fragment.xml | 26 | ||||
| -rw-r--r-- | res/layout/new_phone_favorites_fragment.xml | 4 |
2 files changed, 22 insertions, 8 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" |