diff options
author | Yuli Huang <yuli@google.com> | 2012-05-23 16:06:32 +0800 |
---|---|---|
committer | Yuli Huang <yuli@google.com> | 2012-05-23 16:09:47 +0800 |
commit | e11a51883b91f5fd439c99562e85ff4374d61467 (patch) | |
tree | 9bdebba07d05e1634da611fb9c576c487ae4694b /src/com/android/gallery3d/gadget | |
parent | 883920dce45c1794a8aa6a696563df1bbafeaf45 (diff) | |
download | android_packages_apps_Snap-e11a51883b91f5fd439c99562e85ff4374d61467.tar.gz android_packages_apps_Snap-e11a51883b91f5fd439c99562e85ff4374d61467.tar.bz2 android_packages_apps_Snap-e11a51883b91f5fd439c99562e85ff4374d61467.zip |
Back should progress through Gallery and return Home for widget intents.
bug:6384492
Change-Id: I7ffb824568e400ff5724a29c1908c34a1e10235c
Diffstat (limited to 'src/com/android/gallery3d/gadget')
-rw-r--r-- | src/com/android/gallery3d/gadget/WidgetClickHandler.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/gadget/WidgetClickHandler.java b/src/com/android/gallery3d/gadget/WidgetClickHandler.java index 36575e412..35f9bec36 100644 --- a/src/com/android/gallery3d/gadget/WidgetClickHandler.java +++ b/src/com/android/gallery3d/gadget/WidgetClickHandler.java @@ -26,6 +26,7 @@ import android.widget.Toast; import com.android.gallery3d.R; import com.android.gallery3d.app.Gallery; +import com.android.gallery3d.app.PhotoPage; public class WidgetClickHandler extends Activity { private static final String TAG = "PhotoAppWidgetClickHandler"; @@ -46,14 +47,19 @@ public class WidgetClickHandler extends Activity { @Override protected void onCreate(Bundle savedState) { super.onCreate(savedState); - Intent intent = getIntent(); - if (isValidDataUri(intent.getData())) { - startActivity(new Intent(Intent.ACTION_VIEW, intent.getData())); + Uri uri = getIntent().getData(); + Intent intent; + if (isValidDataUri(uri)) { + intent = new Intent(Intent.ACTION_VIEW, uri); + intent.putExtra(PhotoPage.KEY_TREAT_BACK_AS_UP, true); } else { Toast.makeText(this, R.string.no_such_item, Toast.LENGTH_LONG).show(); - startActivity(new Intent(this, Gallery.class)); + intent = new Intent(this, Gallery.class); } + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | + Intent.FLAG_ACTIVITY_TASK_ON_HOME); + startActivity(intent); finish(); } } |