am 4ef32fda: Merge "Add ability to add extra settings." into gb-ub-photos-denali

* commit '4ef32fda7c6b084b9799e53e3071a1ce5e5b6ac3':
  Add ability to add extra settings.

1 files changed, 8 insertions, 2 deletions

diff --git a/src_pd/com/android/camera/util/SettingsHelper.java b/src_pd/com/android/camera/util/SettingsHelper.java
index 00d87d8f3..523f86f91 100644
--- a/src_pd/com/android/camera/util/SettingsHelper.java
+++ b/src_pd/com/android/camera/util/SettingsHelper.java
@@ -16,6 +16,9 @@
 
 package com.android.camera.util;
 
+import android.content.Context;
+import android.preference.PreferenceFragment;
+
 import com.android.camera.settings.SettingsCache.ExtraSettings;
 import com.android.camera.settings.SettingsManager.Setting;
 
@@ -27,11 +30,14 @@ public class SettingsHelper implements ExtraSettings {
     }
 
     @Override
-    public Setting settingFromId(int id) {
+    public Setting settingFromId(int id, Context context) {
         return null;
     }
 
     public static boolean isOpenSourceLicensesShown() {
         return false;
     }
-}
\ No newline at end of file
+
+    public static void addAdditionalPreferences(PreferenceFragment fragment) {
+    }
+}