summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorwqi <wqi@codeaurora.org>2016-03-10 11:54:20 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-03-23 19:27:22 -0700
commit85875ab2446477acf1bd6bc5dda25be06ed37601 (patch)
tree28d3fc64ed21087875efeef7327925505ad1621f /src
parent20a40e098cf5bcacb15ac6fd5502fa2105d52dcb (diff)
downloadandroid_packages_apps_Gallery2-85875ab2446477acf1bd6bc5dda25be06ed37601.tar.gz
android_packages_apps_Gallery2-85875ab2446477acf1bd6bc5dda25be06ed37601.tar.bz2
android_packages_apps_Gallery2-85875ab2446477acf1bd6bc5dda25be06ed37601.zip
Gallery2: Modify photo editor exit dialog function.
Modify photo editor exit dialog function according to UX specification document. Change-Id: I44f8ecedff3834bffbdc5b5c4acdc4b5b7d6558c CRs-Fixed: 986771
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 46f3d1621..54b637e4e 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -380,7 +380,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
setContentView(R.layout.filtershow_activity);
Resources r = getResources();
setActionBar(false);
- mPopUpText = r.getString(R.string.save_and_exit).toUpperCase(
+ mPopUpText = r.getString(R.string.discard).toUpperCase(
Locale.getDefault());
mExit = r.getString(R.string.exit).toUpperCase(Locale.getDefault());
int marginTop = r.getDimensionPixelSize(R.dimen.compare_margin_top);
@@ -1756,10 +1756,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
@Override
public void onClick(DialogInterface dialog,
int id) {
- // saveImage();
- HistoryManager adapter = mMasterImage
- .getHistory();
- adapter.resetActiveFilter();
+ done();
}
});
builder.setNegativeButton(mExit,