commit cc8e7ab7ae0912186beff20e7f042fd6c1e78b35
author Owen Lin <owenlin@google.com> Fri Jul 27 11:46:50 2012 +0800
committer Owen Lin <owenlin@google.com> Mon Jul 30 16:04:27 2012 +0800
tree eeeb49abf25e08b31a5159be8f81ff5358e3c25d
parent 75a352ad80c698f8c0c3801b7e31b6795b93f955

Don't call Action.setLogo and Action.setHomeButtonEnabled in old API levels.

bug: 6706724
bug: 6706785

Change-Id: I09e48b8a042c5ce84442dddaf4e4bdfd1960ec4f

src/com/android/gallery3d/app/MovieActivity.java

diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 5f4db1d..aa55c9b 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -116,13 +116,20 @@
         win.setBackgroundDrawable(null);
     }
 
+    @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH)
+    private void setActionBarLogoFromIntent(Intent intent) {
+        if (ApiHelper.HAS_ACTION_BAR_SET_LOGO) {
+            Bitmap logo = intent.getParcelableExtra(KEY_LOGO_BITMAP);
+            if (logo != null) {
+                getActionBar().setLogo(new BitmapDrawable(getResources(), logo));
+            }
+        }
+    }
+
     private void initializeActionBar(Intent intent) {
         mUri = intent.getData();
         final ActionBar actionBar = getActionBar();
-        Bitmap logo = intent.getParcelableExtra(KEY_LOGO_BITMAP);
-        if (logo != null) {
-            actionBar.setLogo(new BitmapDrawable(getResources(), logo));
-        }
+        setActionBarLogoFromIntent(intent);
         actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP,
                 ActionBar.DISPLAY_HOME_AS_UP);