diff options
author | John Reck <jreck@google.com> | 2012-12-12 13:43:43 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2012-12-12 13:43:43 -0800 |
commit | 13a39068a7eb3f4bec10deb63fa1f511cbc748c7 (patch) | |
tree | 9d5d98b74c968d3c0a9496e7c22bbbe67bbd0c1f /res | |
parent | 2cc0fd3ebdd95b55abeb587aa87cbe796e6dea4d (diff) | |
download | android_packages_apps_Snap-13a39068a7eb3f4bec10deb63fa1f511cbc748c7.tar.gz android_packages_apps_Snap-13a39068a7eb3f4bec10deb63fa1f511cbc748c7.tar.bz2 android_packages_apps_Snap-13a39068a7eb3f4bec10deb63fa1f511cbc748c7.zip |
remove actionbar sherlock
Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/action_bar_text.xml | 2 | ||||
-rw-r--r-- | res/layout/action_mode.xml | 6 | ||||
-rw-r--r-- | res/layout/popup_list_item.xml | 4 | ||||
-rw-r--r-- | res/menu/movie.xml | 2 | ||||
-rw-r--r-- | res/menu/operation.xml | 4 | ||||
-rw-r--r-- | res/menu/photo.xml | 4 | ||||
-rw-r--r-- | res/values-v14/styles.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/res/layout/action_bar_text.xml b/res/layout/action_bar_text.xml index bff5f1f96..a33264702 100644 --- a/res/layout/action_bar_text.xml +++ b/res/layout/action_bar_text.xml @@ -16,7 +16,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:background="?attr/activatedBackgroundIndicator" + android:background="?android:attr/activatedBackgroundIndicator" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml index 9650de69d..6c516e618 100644 --- a/res/layout/action_mode.xml +++ b/res/layout/action_mode.xml @@ -29,10 +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" + style="?android:attr/actionButtonStyle" android:divider="?android:attr/listDividerAlertDialog" - android:textAppearance="?attr/textAppearanceLargePopupMenu" - android:textColor="?attr/actionMenuTextColor" + android:textAppearance="?android:attr/textAppearanceLargePopupMenu" + android:textColor="?android: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 a72f5b402..5a87af7cc 100644 --- a/res/layout/popup_list_item.xml +++ b/res/layout/popup_list_item.xml @@ -18,11 +18,11 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?attr/textAppearanceLargePopupMenu" + android:textAppearance="?android:attr/textAppearanceLargePopupMenu" android:singleLine="true" android:gravity="center_vertical" android:paddingLeft="16dp" android:paddingRight="16dp" - android:minHeight="?attr/dropdownListPreferredItemHeight" + android:minHeight="?android:attr/listPreferredItemHeight" android:minWidth="196dp" /> diff --git a/res/menu/movie.xml b/res/menu/movie.xml index bc67c29dc..fde235cba 100644 --- a/res/menu/movie.xml +++ b/res/menu/movie.xml @@ -18,6 +18,6 @@ android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share" android:enabled="true" - android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" + android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="ifRoom" /> </menu> diff --git a/res/menu/operation.xml b/res/menu/operation.xml index 984a94432..d1791e22f 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -26,14 +26,14 @@ android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share_panorama" android:visible="false" - android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" + android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="ifRoom"> </item> <item android:id="@+id/action_share" android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share" android:visible="false" - android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" + android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="never"> </item> <item android:id="@+id/action_delete" diff --git a/res/menu/photo.xml b/res/menu/photo.xml index 16b242905..9074aaa07 100644 --- a/res/menu/photo.xml +++ b/res/menu/photo.xml @@ -26,13 +26,13 @@ android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share_panorama" android:visible="false" - android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" + android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="ifRoom" /> <item android:id="@+id/action_share" android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share" android:visible="false" - android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" + android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="never" /> <item android:id="@+id/action_delete" android:icon="@drawable/ic_menu_trash_holo_light" diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml index 060833050..18f3440f3 100644 --- a/res/values-v14/styles.xml +++ b/res/values-v14/styles.xml @@ -15,7 +15,7 @@ --> <resources> - <style name="Theme.GalleryBase" parent="Theme.Sherlock"> + <style name="Theme.GalleryBase" parent="android:Theme.Holo"> <item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item> <item name="switchStyle">@android:style/Widget.CompoundButton</item> </style> diff --git a/res/values/styles.xml b/res/values/styles.xml index 65eb3c0e1..baf9315f8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -15,11 +15,11 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <style name="Theme.GalleryBase" parent="Theme.Sherlock"> + <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="Theme.Sherlock.Dialog"/> + <style name="Theme.Gallery.Dialog" parent="android:Theme.Holo.Dialog"/> <style name="Theme.Gallery" parent="Theme.GalleryBase"> <item name="android:displayOptions"></item> <item name="android:windowContentOverlay">@null</item> |