commit 4a7c63364c6e1a551d11921770269b6aec654aa5
author Linux Build Service Account <lnxbuild@localhost> Sat May 30 04:53:04 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat May 30 04:53:04 2015 -0700
tree 92ea3a3cb303f0c77eb7129e837c4e78a6afbbc1
parent 36cfd9c72b8ed4ddce7625cc01641f2235bb473c
parent eda99aa21c13f704d0cf1101d193c6fdfc28da75

Merge "SnapDragan: Changes to enable UI option for ASD mode."

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 12eaeec..f06e927 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -420,6 +420,7 @@
         <item>@string/pref_camera_scenemode_entry_night</item>
         <item>@string/pref_camera_scenemode_entry_beach</item>
         <item>@string/pref_camera_scenemode_entry_snow</item>
+        <item>@string/pref_camera_scenemode_entry_asd</item>
     </string-array>
 
     <array name="scenemode_thumbnails" translatable="false">
@@ -437,6 +438,7 @@
         <item>@drawable/ic_scene_mode_night</item>
         <item>@drawable/ic_scene_mode_beach</item>
         <item>@drawable/ic_scene_mode_snow</item>
+        <item>@drawable/ic_scene_mode_smartauto</item>
     </array>
 
     <string-array name="pref_camera_scenemode_labels">
@@ -470,6 +472,7 @@
         <item>night</item>
         <item>beach</item>
         <item>snow</item>
+        <item>asd</item>
     </string-array>
 
     <array name="camera_id_entries" translatable="false">

src/com/android/camera/PhotoMenu.java

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index b2ddc02..904bdab 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -950,6 +950,7 @@
         Display display = wm.getDefaultDisplay();
 
         CharSequence[] entries = pref.getEntries();
+        CharSequence[] entryValues = pref.getEntryValues();
 
         int[] thumbnails = pref.getThumbnailIds();
 
@@ -1037,6 +1038,11 @@
             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);
+            }
         }
         previewMenuLayout.addView(basic);
         mPreviewMenu = basic;