diff options
author | maxwen <max.weninger@gmail.com> | 2016-06-04 22:51:06 +0200 |
---|---|---|
committer | Bruno Martins <bgcngm@gmail.com> | 2018-11-20 09:39:49 +0000 |
commit | 00363d5fa3e39e11cfc57d97f2a721b7f34c937f (patch) | |
tree | 8f8bbd1f0dc6f0a4d1aa29cdfa2dbfcf85b71237 /src/com/android/gallery3d/app | |
parent | 8bd64f5a0f4fb0e6a98be85c3d951a6bb389cf2f (diff) | |
download | android_packages_apps_Gallery2-00363d5fa3e39e11cfc57d97f2a721b7f34c937f.tar.gz android_packages_apps_Gallery2-00363d5fa3e39e11cfc57d97f2a721b7f34c937f.tar.bz2 android_packages_apps_Gallery2-00363d5fa3e39e11cfc57d97f2a721b7f34c937f.zip |
Gallery2: Change all share intents to chooser style
Change-Id: Ie4387846ad65dcb7a655630dd86047d5ad63bcb9
Diffstat (limited to 'src/com/android/gallery3d/app')
-rw-r--r-- | src/com/android/gallery3d/app/GalleryActionBar.java | 46 | ||||
-rwxr-xr-x | src/com/android/gallery3d/app/MovieActivity.java | 38 | ||||
-rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 21 |
3 files changed, 47 insertions, 58 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java index b2ce2b2f3..75653036f 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java @@ -34,7 +34,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; -import android.widget.ShareActionProvider; import android.widget.TextView; import android.widget.Toolbar; import android.widget.TwoLineListItem; @@ -405,8 +404,6 @@ public class GalleryActionBar { // } private Menu mActionBarMenu; - private ShareActionProvider mSharePanoramaActionProvider; - private ShareActionProvider mShareActionProvider; private Intent mSharePanoramaIntent; private Intent mShareIntent; @@ -416,20 +413,32 @@ public class GalleryActionBar { MenuItem item = menu.findItem(R.id.action_share_panorama); if (item != null) { - mSharePanoramaActionProvider = (ShareActionProvider) - item.getActionProvider(); - mSharePanoramaActionProvider - .setShareHistoryFileName("panorama_share_history.xml"); - mSharePanoramaActionProvider.setShareIntent(mSharePanoramaIntent); + item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + if (mSharePanoramaIntent != null) { + Intent intent = Intent.createChooser(mSharePanoramaIntent, null); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mContext.startActivity(intent); + } + return true; + } + }); } item = menu.findItem(R.id.action_share); if (item != null) { - mShareActionProvider = (ShareActionProvider) - item.getActionProvider(); - mShareActionProvider - .setShareHistoryFileName("share_history.xml"); - mShareActionProvider.setShareIntent(mShareIntent); + item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + if (mShareIntent != null) { + Intent intent = Intent.createChooser(mShareIntent, null); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mContext.startActivity(intent); + } + return true; + } + }); } } @@ -437,18 +446,9 @@ public class GalleryActionBar { return mActionBarMenu; } - public void setShareIntents(Intent sharePanoramaIntent, Intent shareIntent, - ShareActionProvider.OnShareTargetSelectedListener onShareListener) { + public void setShareIntents(Intent sharePanoramaIntent, Intent shareIntent) { mSharePanoramaIntent = sharePanoramaIntent; - if (mSharePanoramaActionProvider != null) { - mSharePanoramaActionProvider.setShareIntent(sharePanoramaIntent); - } mShareIntent = shareIntent; - if (mShareActionProvider != null) { - mShareActionProvider.setShareIntent(shareIntent); - mShareActionProvider.setOnShareTargetSelectedListener( - onShareListener); - } } public void setBackGroundTransparent() { diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 02ff5de80..ca6eeffcf 100755 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -62,7 +62,6 @@ import android.view.Window; import android.view.WindowManager; import android.widget.CompoundButton; import android.widget.ImageView; -import android.widget.ShareActionProvider; import android.widget.ToggleButton; import android.widget.Toast; @@ -123,7 +122,6 @@ public class MovieActivity extends AbstractPermissionActivity { private Knob mVirtualizerKnob; private SharedPreferences mPrefs; - private ShareActionProvider mShareProvider; private IMovieItem mMovieItem; private IActivityHooker mMovieHooker; private KeyguardManager mKeyguardManager; @@ -132,6 +130,8 @@ public class MovieActivity extends AbstractPermissionActivity { private boolean mResumed = false; private boolean mControlResumed = false; + private Intent mShareIntent; + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(final Context context, final Intent intent) { @@ -360,11 +360,18 @@ public class MovieActivity extends AbstractPermissionActivity { getMenuInflater().inflate(R.menu.movie, menu); MenuItem shareMenu = menu.findItem(R.id.action_share); shareMenu.setVisible(false); - ShareActionProvider provider = (ShareActionProvider) shareMenu.getActionProvider(); - mShareProvider = provider; - if (mShareProvider != null) { - // share provider is singleton, we should refresh our history file. - mShareProvider.setShareHistoryFileName(SHARE_HISTORY_FILE); + if (shareMenu != null) { + shareMenu.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + if (mShareIntent != null) { + Intent intent = Intent.createChooser(mShareIntent, null); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + getApplicationContext().startActivity(mShareIntent); + } + return true; + } + }); } final MenuItem mi = menu.add(R.string.audio_effects); @@ -802,16 +809,13 @@ public class MovieActivity extends AbstractPermissionActivity { private void refreshShareProvider(IMovieItem info) { // we only share the video if it's "content:". - if (mShareProvider != null) { - Intent intent = new Intent(Intent.ACTION_SEND); - if (MovieUtils.isLocalFile(info.getUri(), info.getMimeType())) { - intent.setType("video/*"); - intent.putExtra(Intent.EXTRA_STREAM, info.getUri()); - } else { - intent.setType("text/plain"); - intent.putExtra(Intent.EXTRA_TEXT, String.valueOf(info.getUri())); - } - mShareProvider.setShareIntent(intent); + mShareIntent = new Intent(Intent.ACTION_SEND); + if (MovieUtils.isLocalFile(info.getUri(), info.getMimeType())) { + mShareIntent.setType("video/*"); + mShareIntent.putExtra(Intent.EXTRA_STREAM, info.getUri()); + } else { + mShareIntent.setType("text/plain"); + mShareIntent.putExtra(Intent.EXTRA_TEXT, String.valueOf(info.getUri())); } } diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 793b1d75a..6d4a3e9cc 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -43,7 +43,6 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.widget.RelativeLayout; -import android.widget.ShareActionProvider; import android.widget.Toast; import android.widget.Toolbar; @@ -89,8 +88,8 @@ import java.util.Locale; //import android.drm.DrmHelper; public abstract class PhotoPage extends ActivityState implements - PhotoView.Listener, AppBridge.Server, ShareActionProvider.OnShareTargetSelectedListener, - PhotoPageBottomControls.Delegate, ThreeDButton.Delegate{ + PhotoView.Listener, AppBridge.Server, PhotoPageBottomControls.Delegate, + ThreeDButton.Delegate { private static final String TAG = "PhotoPage"; private static final int MSG_HIDE_BARS = 1; @@ -209,7 +208,6 @@ public abstract class PhotoPage extends ActivityState implements private int mLastSystemUiVis = 0; - private ShareActionProvider mShareActionProvider; private Intent mShareIntent; //use for saving the original height and padding of toolbar @@ -399,7 +397,7 @@ public abstract class PhotoPage extends ActivityState implements } Intent shareIntent = createShareIntent(mCurrentPhoto); if (shareIntent != null) { - mActionBar.setShareIntents(panoramaIntent, shareIntent, PhotoPage.this); + mActionBar.setShareIntents(panoramaIntent, shareIntent); } setNfcBeamPushUri(contentUri); } @@ -1811,19 +1809,6 @@ public abstract class PhotoPage extends ActivityState implements refreshBottomControlsWhenReady(); } - @Override - public boolean onShareTargetSelected(ShareActionProvider source, Intent intent) { - final long timestampMillis = mCurrentPhoto.getDateInMs(); - final String mediaType = getMediaTypeString(mCurrentPhoto); - UsageStatistics.onEvent(UsageStatistics.COMPONENT_GALLERY, - UsageStatistics.ACTION_SHARE, - mediaType, - timestampMillis > 0 - ? System.currentTimeMillis() - timestampMillis - : -1); - return false; - } - private static String getMediaTypeString(MediaItem item) { if (item.getMediaType() == MediaObject.MEDIA_TYPE_VIDEO) { return "Video"; |