summaryrefslogtreecommitdiffstats
path: root/src_pd
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2015-03-30 23:30:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-30 23:30:43 +0000
commit592c9e774a67ffd447ce75ded8e5926524936d18 (patch)
treef31c2e0aebf1887eb5356475c23907278c2046bb /src_pd
parent45314d55fb25d19dc452be076ad3cbd3faaebe29 (diff)
parent46f8751da2fef488f6612b6f2f96e749595d3a2e (diff)
downloadandroid_packages_apps_Camera2-592c9e774a67ffd447ce75ded8e5926524936d18.tar.gz
android_packages_apps_Camera2-592c9e774a67ffd447ce75ded8e5926524936d18.tar.bz2
android_packages_apps_Camera2-592c9e774a67ffd447ce75ded8e5926524936d18.zip
Merge "Add support for new independent Lens Blur quality setting." into ub-camera-haleakala
Diffstat (limited to 'src_pd')
-rw-r--r--src_pd/com/android/camera/util/CameraSettingsActivityHelper.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src_pd/com/android/camera/util/CameraSettingsActivityHelper.java b/src_pd/com/android/camera/util/CameraSettingsActivityHelper.java
index f7759a3fb..966539195 100644
--- a/src_pd/com/android/camera/util/CameraSettingsActivityHelper.java
+++ b/src_pd/com/android/camera/util/CameraSettingsActivityHelper.java
@@ -22,4 +22,11 @@ import android.preference.PreferenceFragment;
public class CameraSettingsActivityHelper {
public static void addAdditionalPreferences(PreferenceFragment fragment, Context context) {
}
+
+ public static void onSizesLoaded(PreferenceFragment fragment,
+ List<Size> backCameraSizes, ListPreferenceFiller cameraSizesFiller) {
+ }
+
+ public static void verifyDefaults(SettingsManager settingsManager, Context context) {
+ }
}