diff options
author | Owen Lin <owenlin@google.com> | 2012-08-27 10:01:22 +0800 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2012-08-28 17:09:06 +0800 |
commit | 8331b6a3d39b5b87eb70ac0cc201f525689c45fb (patch) | |
tree | d1a6b73bbd875e2eb3274c7df53c1a2067dc6706 /res | |
parent | 0d9061bd11c1b9def55e858fdd5ce5e9959e62db (diff) | |
download | android_packages_apps_Snap-8331b6a3d39b5b87eb70ac0cc201f525689c45fb.tar.gz android_packages_apps_Snap-8331b6a3d39b5b87eb70ac0cc201f525689c45fb.tar.bz2 android_packages_apps_Snap-8331b6a3d39b5b87eb70ac0cc201f525689c45fb.zip |
Fix some UI bugs in using SherlockActionBar.
- Use sherlock's verion of requestWindowFeature.
- Use sherlock's theme in Custom selection list.
bug: 6927267
Change-Id: I706e45378b10e6e088e048d97fcaca57fb4bf3f4
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/action_mode.xml | 4 | ||||
-rw-r--r-- | res/layout/popup_list_item.xml | 5 | ||||
-rw-r--r-- | res/values-v11/styles.xml | 23 | ||||
-rw-r--r-- | res/values/styles.xml | 2 |
4 files changed, 7 insertions, 27 deletions
diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml index d4b3c23d3..9650de69d 100644 --- a/res/layout/action_mode.xml +++ b/res/layout/action_mode.xml @@ -29,8 +29,10 @@ android:layout_height="match_parent" android:src="@drawable/dropdown_ic_arrow_normal_holo_dark" /> <Button android:id="@+id/selection_menu" + style="?attr/actionButtonStyle" android:divider="?android:attr/listDividerAlertDialog" - style="?android:attr/borderlessButtonStyle" + android:textAppearance="?attr/textAppearanceLargePopupMenu" + android:textColor="?attr/actionMenuTextColor" android:singleLine="true" android:gravity="left|center_vertical" android:paddingRight="25dip" diff --git a/res/layout/popup_list_item.xml b/res/layout/popup_list_item.xml index 3c43e8c1a..a72f5b402 100644 --- a/res/layout/popup_list_item.xml +++ b/res/layout/popup_list_item.xml @@ -18,10 +18,11 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:textAppearance="?attr/textAppearanceLargePopupMenu" + android:singleLine="true" android:gravity="center_vertical" android:paddingLeft="16dp" android:paddingRight="16dp" - android:minHeight="?attr/listPreferredItemHeightSmall" + android:minHeight="?attr/dropdownListPreferredItemHeight" android:minWidth="196dp" /> diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml deleted file mode 100644 index 56c036317..000000000 --- a/res/values-v11/styles.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <style name="Theme.GalleryBase" parent="android:Theme.Holo"> - <item name="listPreferredItemHeightSmall">48dp</item> - <item name="switchStyle">@android:style/Widget.CompoundButton</item> - </style> - <style name="Theme.Gallery.Dialog" parent="android:Theme.Holo.Dialog"/> -</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 10354a146..889d7f429 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -19,7 +19,7 @@ <item name="listPreferredItemHeightSmall">48dp</item> <item name="switchStyle">@android:style/Widget.CompoundButton</item> </style> - <style name="Theme.Gallery.Dialog" parent="android:Theme.Dialog"/> + <style name="Theme.Gallery.Dialog" parent="Theme.Sherlock.Dialog"/> <style name="Theme.Gallery" parent="Theme.GalleryBase"> <item name="android:displayOptions"></item> <item name="android:windowContentOverlay">@null</item> |