diff options
author | Owen Lin <owenlin@google.com> | 2012-08-24 12:25:57 +0800 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2012-08-27 12:30:47 +0800 |
commit | a57d8fedf0b998036289b7bc30de8268553304f4 (patch) | |
tree | 5b204c8a8b2e1981e190487338bea88ed3f3a3e6 | |
parent | f27cbd2417a4171e49af603aa7da02fab865e102 (diff) | |
download | android_packages_apps_Snap-a57d8fedf0b998036289b7bc30de8268553304f4.tar.gz android_packages_apps_Snap-a57d8fedf0b998036289b7bc30de8268553304f4.tar.bz2 android_packages_apps_Snap-a57d8fedf0b998036289b7bc30de8268553304f4.zip |
Uses ActionBarSherlock in Gallery
bug: 6927267
Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
-rw-r--r-- | res/layout/action_bar_text.xml | 2 | ||||
-rw-r--r-- | res/menu/movie.xml | 1 | ||||
-rw-r--r-- | res/menu/operation.xml | 1 | ||||
-rw-r--r-- | res/menu/photo.xml | 1 | ||||
-rw-r--r-- | res/values-v14/styles.xml | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/ui/DetailsAddressResolver.java | 6 |
6 files changed, 8 insertions, 5 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> diff --git a/src/com/android/gallery3d/ui/DetailsAddressResolver.java b/src/com/android/gallery3d/ui/DetailsAddressResolver.java index 3dd20a5e0..8de667745 100644 --- a/src/com/android/gallery3d/ui/DetailsAddressResolver.java +++ b/src/com/android/gallery3d/ui/DetailsAddressResolver.java @@ -21,7 +21,7 @@ import android.location.Address; import android.os.Handler; import android.os.Looper; -import com.android.gallery3d.app.GalleryActivity; +import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.data.MediaDetails; import com.android.gallery3d.util.Future; import com.android.gallery3d.util.FutureListener; @@ -32,7 +32,7 @@ import com.android.gallery3d.util.ThreadPool.JobContext; public class DetailsAddressResolver { private AddressResolvingListener mListener; - private final GalleryActivity mContext; + private final AbstractGalleryActivity mContext; private Future<Address> mAddressLookupJob; private final Handler mHandler; @@ -54,7 +54,7 @@ public class DetailsAddressResolver { public void onAddressAvailable(String address); } - public DetailsAddressResolver(GalleryActivity context) { + public DetailsAddressResolver(AbstractGalleryActivity context) { mContext = context; mHandler = new Handler(Looper.getMainLooper()); } |