diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-09-04 07:16:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-04 07:16:55 -0700 |
| commit | 2ba0b8be7e2cbd1ba221ddec8bef8ee940553fc7 (patch) | |
| tree | 980cbe92ce3485af91f6ff0b0c368d42d357adae /res | |
| parent | 10494a8ab5668d090d97f517297e14c6e06cd429 (diff) | |
| parent | a4441ac9ccfffc89ee66e8fc9be2b363f7e29c92 (diff) | |
am a4441ac9: am f802f432: Merge "Show bottom action bar throughout dialer" into klp-dev
* commit 'a4441ac9ccfffc89ee66e8fc9be2b363f7e29c92':
Show bottom action bar throughout dialer
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/dialtacts_activity.xml | 30 | ||||
| -rw-r--r-- | res/layout/phone_favorites_fragment.xml | 30 |
2 files changed, 30 insertions, 30 deletions
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml index 580e0bf43..e4eb2b3c5 100644 --- a/res/layout/dialtacts_activity.xml +++ b/res/layout/dialtacts_activity.xml @@ -69,6 +69,36 @@ android:id="@+id/dialtacts_frame" android:clipChildren="false"> </FrameLayout> + <FrameLayout + 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"> + <ImageButton + android:id="@+id/call_history_button" + android:layout_width="@dimen/fake_menu_button_min_width" + android:layout_height="match_parent" + android:layout_gravity="bottom|start" + android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/action_menu_call_history_description" + android:src="@drawable/ic_menu_history_dk"/> + <ImageButton + android:id="@+id/dialpad_button" + android:layout_width="@dimen/fake_menu_button_min_width" + android:layout_height="match_parent" + android:layout_gravity="bottom|center" + android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/action_menu_dialpad_button" + 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_dk" + android:contentDescription="@string/action_menu_overflow_description" + android:background="?android:attr/selectableItemBackground"/> + </FrameLayout> <View android:id="@+id/dialtacts_bottom_padding" android:layout_width="match_parent" diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml index cb37e6cb5..3b9e589eb 100644 --- a/res/layout/phone_favorites_fragment.xml +++ b/res/layout/phone_favorites_fragment.xml @@ -46,34 +46,4 @@ android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceLarge"/> </FrameLayout> - <FrameLayout - 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"> - <ImageButton - android:id="@+id/call_history_button" - android:layout_width="@dimen/fake_menu_button_min_width" - android:layout_height="match_parent" - android:layout_gravity="bottom|start" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/action_menu_call_history_description" - android:src="@drawable/ic_menu_history_dk"/> - <ImageButton - android:id="@+id/dialpad_button" - android:layout_width="@dimen/fake_menu_button_min_width" - android:layout_height="match_parent" - android:layout_gravity="bottom|center" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/action_menu_dialpad_button" - 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_dk" - android:contentDescription="@string/action_menu_overflow_description" - android:background="?android:attr/selectableItemBackground"/> - </FrameLayout> </LinearLayout> |