diff options
| author | John Hoford <hoford@google.com> | 2013-05-01 13:19:06 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2013-05-01 13:19:06 -0700 |
| commit | d16de2ee0d4abc6dc46b949f693b1a865344dfa3 (patch) | |
| tree | 760425b4a30af0b510e0045d083200253f13ca7d /src/com/android/gallery3d/filtershow/controller | |
| parent | 4f7fe16804568f9bcb189ab7916e403f8b1e2f90 (diff) | |
| parent | b15919a1bccfcecd24c35001837626c73b0a4bdb (diff) | |
| download | android_packages_apps_Snap-d16de2ee0d4abc6dc46b949f693b1a865344dfa3.tar.gz android_packages_apps_Snap-d16de2ee0d4abc6dc46b949f693b1a865344dfa3.tar.bz2 android_packages_apps_Snap-d16de2ee0d4abc6dc46b949f693b1a865344dfa3.zip | |
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad
Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
Diffstat (limited to 'src/com/android/gallery3d/filtershow/controller')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/controller/TitledSlider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/controller/TitledSlider.java b/src/com/android/gallery3d/filtershow/controller/TitledSlider.java index cbaa48923..f29442bb9 100644 --- a/src/com/android/gallery3d/filtershow/controller/TitledSlider.java +++ b/src/com/android/gallery3d/filtershow/controller/TitledSlider.java @@ -87,8 +87,8 @@ public class TitledSlider implements Control { @Override public void updateUI() { - if (mControlName != null) { - mControlName.setText(mParameter.getParameterName()); + if (mControlName != null && mParameter.getParameterName() != null) { + mControlName.setText(mParameter.getParameterName().toUpperCase()); } if (mControlValue != null) { mControlValue.setText( |