diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-05-30 04:53:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-05-30 04:53:04 -0700 |
| commit | 4a7c63364c6e1a551d11921770269b6aec654aa5 (patch) | |
| tree | 92ea3a3cb303f0c77eb7129e837c4e78a6afbbc1 /src/com/android/camera/PhotoMenu.java | |
| parent | 36cfd9c72b8ed4ddce7625cc01641f2235bb473c (diff) | |
| parent | eda99aa21c13f704d0cf1101d193c6fdfc28da75 (diff) | |
| download | android_packages_apps_Snap-4a7c63364c6e1a551d11921770269b6aec654aa5.tar.gz android_packages_apps_Snap-4a7c63364c6e1a551d11921770269b6aec654aa5.tar.bz2 android_packages_apps_Snap-4a7c63364c6e1a551d11921770269b6aec654aa5.zip | |
Merge "SnapDragan: Changes to enable UI option for ASD mode."
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index b2ddc028a..904bdabc8 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -950,6 +950,7 @@ public class PhotoMenu extends MenuController Display display = wm.getDefaultDisplay(); CharSequence[] entries = pref.getEntries(); + CharSequence[] entryValues = pref.getEntryValues(); int[] thumbnails = pref.getThumbnailIds(); @@ -1037,6 +1038,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; |