diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-11-18 12:54:27 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-18 12:54:27 -0800 |
| commit | f5f2674933300946869f1939e001c3d82eb910c2 (patch) | |
| tree | 39f741ef911f6de6b7486eaf51cda24c713ef47f | |
| parent | aedf855f64b4a9f88dfcb31a18d47757d780e3fa (diff) | |
| parent | ad35e3b39d897946be9e239c7de394a4b35f4e36 (diff) | |
| download | android_packages_apps_Snap-f5f2674933300946869f1939e001c3d82eb910c2.tar.gz android_packages_apps_Snap-f5f2674933300946869f1939e001c3d82eb910c2.tar.bz2 android_packages_apps_Snap-f5f2674933300946869f1939e001c3d82eb910c2.zip | |
Merge "SnapdragonCamera: Handle cam switch icon if numOfCams less than 2"
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 12 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 03235cc90..f709174e2 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1866,6 +1866,14 @@ public class PhotoModule Log.e(TAG,"loadCameraPreferences() updating camera_id pref"); + IconListPreference switchIconPref = + (IconListPreference)mPreferenceGroup.findPreference( + CameraSettings.KEY_CAMERA_ID); + + //if numOfCams < 2 then switchIconPref will be null as there is no switch icon in this case + if (switchIconPref == null) + return; + int[] iconIds = new int[numOfCams]; String[] entries = new String[numOfCams]; String[] labels = new String[numOfCams]; @@ -1886,10 +1894,6 @@ public class PhotoModule } } - IconListPreference switchIconPref = - (IconListPreference)mPreferenceGroup.findPreference( - CameraSettings.KEY_CAMERA_ID); - switchIconPref.setIconIds(iconIds); switchIconPref.setEntries(entries); switchIconPref.setLabels(labels); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 8cb372f5e..04aa1fb8f 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -534,6 +534,14 @@ public class VideoModule implements CameraModule, Log.e(TAG,"loadCameraPreferences() updating camera_id pref"); + IconListPreference switchIconPref = + (IconListPreference)mPreferenceGroup.findPreference( + CameraSettings.KEY_CAMERA_ID); + + //if numOfCams < 2 then switchIconPref will be null as there is no switch icon in this case + if (switchIconPref == null) + return; + int[] iconIds = new int[numOfCams]; String[] entries = new String[numOfCams]; String[] labels = new String[numOfCams]; @@ -554,10 +562,6 @@ public class VideoModule implements CameraModule, } } - IconListPreference switchIconPref = - (IconListPreference)mPreferenceGroup.findPreference( - CameraSettings.KEY_CAMERA_ID); - switchIconPref.setIconIds(iconIds); switchIconPref.setEntries(entries); switchIconPref.setLabels(labels); |