summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorzdi <zdi@codeaurora.org>2016-02-03 11:49:29 +0800
committerzdi <zdi@codeaurora.org>2016-02-03 11:52:32 +0800
commit1f168ca8a21f5e6e6ca827c3280c7057da807a6c (patch)
treebcbee290fc7bde67402641141d94dbe301ee0dd8 /src
parentb13a6ae2441c37688960d3d9115de76e5c2fe5ac (diff)
downloadandroid_packages_apps_Gallery2-1f168ca8a21f5e6e6ca827c3280c7057da807a6c.tar.gz
android_packages_apps_Gallery2-1f168ca8a21f5e6e6ca827c3280c7057da807a6c.tar.bz2
android_packages_apps_Gallery2-1f168ca8a21f5e6e6ca827c3280c7057da807a6c.zip
Gallery2: Fix NullPointerException when select "Vignette" or "Saturation".
Use super.reflectCurrentFilter(), because mFilterTitle may be null. Change-Id: I715dd64b88a10ceea43822ab64c647c90c46fc09 CRs-Fixed: 970812
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/editors/EditorChanSat.java3
-rw-r--r--src/com/android/gallery3d/filtershow/editors/EditorVignette.java3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorChanSat.java b/src/com/android/gallery3d/filtershow/editors/EditorChanSat.java
index 135c19373..00460e505 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorChanSat.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorChanSat.java
@@ -162,8 +162,7 @@ public class EditorChanSat extends ParametricEditor implements OnSeekBarChangeLi
value = rep.getValue(FilterChanSatRepresentation.MODE_MAGENTA);
mMagentaBar.setProgress(value + 100);
mMagentaValue.setText("" + value);
- String text = mContext.getString(rep.getTextId());
- mFilterTitle.setText(text);
+ super.reflectCurrentFilter();
updateText();
}
}
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorVignette.java b/src/com/android/gallery3d/filtershow/editors/EditorVignette.java
index fb17ba76e..9766e19e4 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorVignette.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorVignette.java
@@ -128,8 +128,7 @@ public class EditorVignette extends ParametricEditor {
}
mImageVignette.setRepresentation(rep);
- String text = mContext.getString(rep.getTextId());
- mFilterTitle.setText(text);
+ super.reflectCurrentFilter();
updateText();
}
}