summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-08-24 12:25:57 +0800
committerOwen Lin <owenlin@google.com>2012-08-27 12:30:47 +0800
commitb21b8e58a604f6c701245d84b141b5b87663192b (patch)
tree90bbcfacff012d765d15f7c954a46c9ef560019d /res
parent7916a57fb06d625e5c544e289cd487622d2c3137 (diff)
downloadandroid_packages_apps_Gallery2-b21b8e58a604f6c701245d84b141b5b87663192b.tar.gz
android_packages_apps_Gallery2-b21b8e58a604f6c701245d84b141b5b87663192b.tar.bz2
android_packages_apps_Gallery2-b21b8e58a604f6c701245d84b141b5b87663192b.zip
Uses ActionBarSherlock in Gallery
bug: 6927267 Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
Diffstat (limited to 'res')
-rw-r--r--res/layout/action_bar_text.xml2
-rw-r--r--res/menu/movie.xml1
-rw-r--r--res/menu/operation.xml1
-rw-r--r--res/menu/photo.xml1
-rw-r--r--res/values-v14/styles.xml2
5 files changed, 5 insertions, 2 deletions
diff --git a/res/layout/action_bar_text.xml b/res/layout/action_bar_text.xml
index 7fccf0268..bded20102 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="?android:attr/activatedBackgroundIndicator"
+ android:background="?attr/activatedBackgroundIndicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/res/menu/movie.xml b/res/menu/movie.xml
index ce3a100d0..bc67c29dc 100644
--- a/res/menu/movie.xml
+++ b/res/menu/movie.xml
@@ -18,5 +18,6 @@
android:icon="@drawable/ic_menu_share_holo_light"
android:title="@string/share"
android:enabled="true"
+ android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
android:showAsAction="ifRoom" />
</menu>
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index 918c532cc..aeef78fdd 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -23,6 +23,7 @@
android:icon="@drawable/ic_menu_share_holo_light"
android:title="@string/share"
android:visible="false"
+ android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
android:showAsAction="ifRoom">
</item>
<item android:id="@+id/action_delete"
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index bc4ccb3ab..b3820c3a6 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -24,6 +24,7 @@
android:title="@string/share"
android:enabled="true"
android:visible="false"
+ android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
android:showAsAction="ifRoom" />
<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 b6d6e437b..db89b05f4 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -15,7 +15,7 @@
-->
<resources>
- <style name="Theme.GalleryBase" parent="android:Theme.Holo">
+ <style name="Theme.GalleryBase" parent="Theme.Sherlock">
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
<item name="switchStyle">@android:style/Widget.CompoundButton</item>
</style>