diff options
| -rw-r--r-- | res/values/arrays.xml | 3 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 080638538..d2c549481 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -524,6 +524,7 @@ <item>@string/pref_camera_scenemode_entry_text</item> <item>@string/pref_camera_scenemode_entry_theatre</item> <item>@string/pref_camera_scenemode_entry_whiteboard</item> + <item>@string/pref_camera_scenemode_entry_asd</item> </string-array> <array name="scenemode_thumbnails" translatable="false"> @@ -579,6 +580,7 @@ <item>@drawable/ic_scene_mode_entry_text</item> <item>@drawable/ic_scene_mode_entry_theatre</item> <item>@drawable/ic_scene_mode_entry_whiteboard</item> + <item>@drawable/ic_scene_mode_smartauto</item> </array> <string-array name="pref_camera_scenemode_labels"> @@ -650,6 +652,7 @@ <item>text</item> <item>theatre</item> <item>white-board</item> + <item>asd</item> </string-array> <array name="camera_id_entries" translatable="false"> diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index d6efc069a..d77d90051 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -751,6 +751,7 @@ public class PhotoMenu extends MenuController } CharSequence[] entries = pref.getEntries(); + CharSequence[] entryValues = pref.getEntryValues(); int[] thumbnails = pref.getThumbnailIds(); @@ -825,6 +826,11 @@ public class PhotoMenu extends MenuController imageView.setImageResource(thumbnails[i]); label.setText(entries[i]); layout.addView(layout2); + + // ASD only available when developer options are enabled. + if(entryValues[i].equals("asd")) { + layout2.setVisibility(mActivity.isDeveloperMenuEnabled()?View.VISIBLE:View.GONE); + } } mPreviewMenu = basic; } |