diff options
author | Guruprasad Gaonkar <ggaonk@codeaurora.org> | 2015-05-12 11:09:57 -0700 |
---|---|---|
committer | Guruprasad Gaonkar <ggaonk@codeaurora.org> | 2015-05-12 11:09:57 -0700 |
commit | eda99aa21c13f704d0cf1101d193c6fdfc28da75 (patch) | |
tree | 8e3a3822fcffc5cd0840479225b0704a7d3a6e94 | |
parent | 852d50c360f30099b2538488aafe5a14bebc98b7 (diff) | |
download | android_packages_apps_Snap-eda99aa21c13f704d0cf1101d193c6fdfc28da75.tar.gz android_packages_apps_Snap-eda99aa21c13f704d0cf1101d193c6fdfc28da75.tar.bz2 android_packages_apps_Snap-eda99aa21c13f704d0cf1101d193c6fdfc28da75.zip |
SnapDragan: Changes to enable UI option for ASD mode.
ASD menu was not available on latest snapdragon application.
Changes provided to enable scene modes.
Change-Id: If02e97c4912ade7463055c8fefc35d10009a7c9e
-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 96234eda8..7046906da 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -409,6 +409,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"> @@ -425,6 +426,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"> @@ -457,6 +459,7 @@ <item>night</item> <item>beach</item> <item>snow</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 a70efdbad..27f04f390 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -948,6 +948,7 @@ public class PhotoMenu extends MenuController Display display = wm.getDefaultDisplay(); CharSequence[] entries = pref.getEntries(); + CharSequence[] entryValues = pref.getEntryValues(); int[] thumbnails = pref.getThumbnailIds(); @@ -1035,6 +1036,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); + } } previewMenuLayout.addView(basic); mPreviewMenu = basic; |