diff options
| author | George Mount <mount@google.com> | 2013-04-18 21:20:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-18 21:20:31 +0000 |
| commit | 9d39c070458686fa31c3173c72332eee60c4dd14 (patch) | |
| tree | 3227bddd72dce2b1ecb13fb43ae9002bac97ed97 /src | |
| parent | b0e82433a948ab7625d5c0343a4207ea9a45bbf7 (diff) | |
| parent | 1e259a86f780b2857793b8fba82d98c871989639 (diff) | |
| download | android_packages_apps_Snap-9d39c070458686fa31c3173c72332eee60c4dd14.tar.gz android_packages_apps_Snap-9d39c070458686fa31c3173c72332eee60c4dd14.tar.bz2 android_packages_apps_Snap-9d39c070458686fa31c3173c72332eee60c4dd14.zip | |
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/ListPreference.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java index 9ea2e34ec..d1d34911b 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -70,7 +70,7 @@ public class ListPreference extends CameraPreference { setEntryValues(a.getTextArray( R.styleable.ListPreference_entryValues)); setLabels(a.getTextArray( - R.styleable.ListPreference_labels)); + R.styleable.ListPreference_labelList)); a.recycle(); } |