Remove extra parent mode from array, and make PhotoModule scope string public
When pruning modes, we neglected to remove one of the 'photo' parent modes.
This still worked because the last two entries were both 'photo'. Also,
making PhotoModule scope string public so it can be referred to by
other modules, to accomplish the same parent function as the array.
Bug: 17103121
Change-Id: I574e9a7c2db8bf2c86d810c930fbf510d5aa1a24
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 9ebeea8..3fb1063 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -434,7 +434,6 @@
<item>@integer/camera_mode_photosphere</item>
<item>@integer/camera_mode_panorama</item>
<item>@integer/camera_mode_photo</item>
- <item>@integer/camera_mode_photo</item>
</integer-array>
<!-- An array of camera mode indices that should always be visible in mode drawer. -->
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 59539b0..70b96cd 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -110,7 +110,7 @@
RemoteCameraModule,
CountDownView.OnCountDownStatusListener {
- private static final String PHOTO_MODULE_STRING_ID = "PhotoModule";
+ public static final String PHOTO_MODULE_STRING_ID = "PhotoModule";
private static final Log.Tag TAG = new Log.Tag(PHOTO_MODULE_STRING_ID);