diff options
| author | Owen Lin <owenlin@google.com> | 2012-07-27 11:46:50 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2012-07-30 16:04:27 +0800 |
| commit | 3ff33ee566475998767adff1f32e5aa42d27ea3c (patch) | |
| tree | b57c17c7f98c112d592f7d4fc6ded53e4ef4cea5 /src/com/android/gallery3d/app/MovieActivity.java | |
| parent | f51196e8b35f6c7ff81fce6a2fb837f1d4f76c40 (diff) | |
| download | android_packages_apps_Snap-3ff33ee566475998767adff1f32e5aa42d27ea3c.tar.gz android_packages_apps_Snap-3ff33ee566475998767adff1f32e5aa42d27ea3c.tar.bz2 android_packages_apps_Snap-3ff33ee566475998767adff1f32e5aa42d27ea3c.zip | |
Don't call Action.setLogo and Action.setHomeButtonEnabled in old API levels.
bug: 6706724
bug: 6706785
Change-Id: I09e48b8a042c5ce84442dddaf4e4bdfd1960ec4f
Diffstat (limited to 'src/com/android/gallery3d/app/MovieActivity.java')
| -rw-r--r-- | src/com/android/gallery3d/app/MovieActivity.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 5f4db1d13..aa55c9bdf 100644 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -116,13 +116,20 @@ public class MovieActivity extends Activity { 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); |