diff options
| author | Chih-Chung Chang <> | 2009-04-08 05:15:49 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-08 05:15:49 -0700 |
| commit | 4b85a0e01a0440a209d4df8fbf48fbcf8ac33e65 (patch) | |
| tree | de3800ece2cdd62a7821705f4aa2381b19a05318 /src/com/android/camera/CameraSettings.java | |
| parent | 6542db336dfec1ab05827cc8da88c2cb0dab525a (diff) | |
| parent | 272c3fdc60d4b4f773dfdff46ad3dd643ce22d5c (diff) | |
| download | LegacyCamera-4b85a0e01a0440a209d4df8fbf48fbcf8ac33e65.zip LegacyCamera-4b85a0e01a0440a209d4df8fbf48fbcf8ac33e65.tar.gz LegacyCamera-4b85a0e01a0440a209d4df8fbf48fbcf8ac33e65.tar.bz2 | |
Merge branch 'readonly-p4-donut' into donut
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index f9076aa..cf8f826 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -29,8 +29,8 @@ import java.util.StringTokenizer; /** * CameraSettings */ -public class CameraSettings extends PreferenceActivity - implements OnSharedPreferenceChangeListener { +public class CameraSettings extends PreferenceActivity implements + OnSharedPreferenceChangeListener { public static final String KEY_VIDEO_QUALITY = "pref_camera_videoquality_key"; public static final String KEY_WHITE_BALANCE = @@ -43,7 +43,6 @@ public class CameraSettings extends PreferenceActivity private ListPreference mEffect; private Parameters mParameters; - /** Called with the activity is first created. */ @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -147,4 +146,3 @@ public class CameraSettings extends PreferenceActivity } } } - |