diff options
| author | zafir <zafir@google.com> | 2015-02-05 19:04:38 -0800 |
|---|---|---|
| committer | zafir <zafir@google.com> | 2015-02-25 11:52:24 -0800 |
| commit | 734122e8fe6c621a8510043839f05a0adff4c3a4 (patch) | |
| tree | e5d4a99ff5922a9485b049204ba338105a98a310 /src/com/android/camera/util | |
| parent | 1353ff4af747ace3364843dc128e3dea180427bf (diff) | |
| download | android_packages_apps_Camera2-734122e8fe6c621a8510043839f05a0adff4c3a4.tar.gz android_packages_apps_Camera2-734122e8fe6c621a8510043839f05a0adff4c3a4.tar.bz2 android_packages_apps_Camera2-734122e8fe6c621a8510043839f05a0adff4c3a4.zip | |
Adding reporting functionality using Feedback API for PhotoModule and CaptureModule when captured pictures don't save to the device.
Bug: 19231841
Change-Id: I7d66db1e4c273dc7ec082f40a80b349bd91a7e8b
Diffstat (limited to 'src/com/android/camera/util')
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 8813ca7da..123878f82 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -284,12 +284,15 @@ public class CameraUtil { * Shows custom error dialog. Designed specifically * for the scenario where the camera cannot be attached. */ - public static void showErrorAndFinish(final Activity activity, int msgId) { - DialogInterface.OnClickListener buttonListener = + public static void showError(final Activity activity, final int dialogMsgId, final int feedbackMsgId, + final boolean finishActivity) { + final DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - activity.finish(); + if (finishActivity) { + activity.finish(); + } } }; @@ -297,8 +300,10 @@ public class CameraUtil { new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - new GoogleHelpHelper(activity).sendGoogleFeedback(); - activity.finish(); + new GoogleHelpHelper(activity).sendGoogleFeedback(feedbackMsgId); + if (finishActivity) { + activity.finish(); + } } }; TypedValue out = new TypedValue(); @@ -311,7 +316,7 @@ public class CameraUtil { new AlertDialog.Builder(activity) .setCancelable(false) .setTitle(R.string.camera_error_title) - .setMessage(msgId) + .setMessage(dialogMsgId) .setNegativeButton(R.string.dialog_report, reportButtonListener) .setPositiveButton(R.string.dialog_dismiss, buttonListener) .setIcon(out.resourceId) |