diff options
author | Owen Lin <owenlin@google.com> | 2012-07-13 17:23:05 +0800 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2012-08-15 14:49:42 +0800 |
commit | 7c1e03a70f54fb735e6ef59733a02131579ae1f8 (patch) | |
tree | fec327ba0551f3dcc5dac643309ac8dde4df0ef7 /src/com/android/gallery3d/app/MovieActivity.java | |
parent | 9ef602b77ad0cc7aca49a05f39f193277e0e8ae7 (diff) | |
download | android_packages_apps_Snap-7c1e03a70f54fb735e6ef59733a02131579ae1f8.tar.gz android_packages_apps_Snap-7c1e03a70f54fb735e6ef59733a02131579ae1f8.tar.bz2 android_packages_apps_Snap-7c1e03a70f54fb735e6ef59733a02131579ae1f8.zip |
Extract the action bar interface.
So that we can use different implementation for different API levels.
**NOTE**
This change is going to be replaced by the ActionBar compat library
when it gets ready. The purpose of this change is making Gallery/Camera
run on GB.
bug: 6927267
Change-Id: Ic8bb2518918168ea889db6452d6760de390d96b2
Diffstat (limited to 'src/com/android/gallery3d/app/MovieActivity.java')
-rw-r--r-- | src/com/android/gallery3d/app/MovieActivity.java | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 8fe0f0087..26ae37e43 100644 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -17,7 +17,6 @@ package com.android.gallery3d.app; import android.annotation.TargetApi; -import android.app.ActionBar; import android.app.Activity; import android.content.AsyncQueryHandler; import android.content.ContentResolver; @@ -38,9 +37,10 @@ import android.view.MenuItem; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.widget.ShareActionProvider; import com.android.gallery3d.R; +import com.android.gallery3d.actionbar.ActionBarInterface; +import com.android.gallery3d.actionbar.ActionBarUtils; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.Utils; @@ -128,10 +128,10 @@ public class MovieActivity extends Activity { private void initializeActionBar(Intent intent) { mUri = intent.getData(); - final ActionBar actionBar = getActionBar(); + final ActionBarInterface actionBar = ActionBarUtils.getActionBar(this); setActionBarLogoFromIntent(intent); - actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, - ActionBar.DISPLAY_HOME_AS_UP); + actionBar.setDisplayOptions(ActionBarInterface.DISPLAY_HOME_AS_UP, + ActionBarInterface.DISPLAY_HOME_AS_UP); String title = intent.getStringExtra(Intent.EXTRA_TITLE); if (title != null) { @@ -167,25 +167,18 @@ public class MovieActivity extends Activity { @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - getMenuInflater().inflate(R.menu.movie, menu); - + ActionBarInterface actionBar = ActionBarUtils.getActionBar(this); + boolean result = actionBar.createActionMenu(menu, R.menu.movie); // Document says EXTRA_STREAM should be a content: Uri // So, we only share the video if it's "content:". if (ContentResolver.SCHEME_CONTENT.equals(mUri.getScheme())) { - initializeShareActionProvider(menu); + if (actionBar.hasShareMenuItem()) { + actionBar.setShareIntent(createShareIntent()); + } } else { menu.findItem(R.id.action_share).setVisible(false); } - return true; - } - - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) - private void initializeShareActionProvider(Menu menu) { - if (!ApiHelper.HAS_SHARE_ACTION_PROVIDER) return; - - ShareActionProvider provider = GalleryActionBar.initializeShareActionProvider( - menu, this); - provider.setShareIntent(createShareIntent()); + return result; } private Intent createShareIntent() { |