diff options
| author | Julian Veit <claymore1298@gmail.com> | 2022-03-20 00:06:45 +0100 |
|---|---|---|
| committer | Julian Veit <claymore1298@gmail.com> | 2022-03-20 00:06:45 +0100 |
| commit | d250e4a60f3b6219c6925534629eee12834a92b8 (patch) | |
| tree | 52fb90369927e24dc962b6ec283f6a3f710f7a6c /src/com/android/camera/ui/ProMode.java | |
| parent | ef111dceb9e3fce395bff4f6a4ef1591c701e80c (diff) | |
| parent | 8c444160bd565319468cce5bfdcfc11d20e8b7cb (diff) | |
Merge branch 'lineage-18.1' of https://github.com/LineageOS/android_packages_apps_Snap into HEADHEADs12.1
Change-Id: Ia09760085480a6a028c8969f16f503070ab816e5
Diffstat (limited to 'src/com/android/camera/ui/ProMode.java')
| -rw-r--r--[-rwxr-xr-x] | src/com/android/camera/ui/ProMode.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/camera/ui/ProMode.java b/src/com/android/camera/ui/ProMode.java index d1ad0fade..3ff9ae2be 100755..100644 --- a/src/com/android/camera/ui/ProMode.java +++ b/src/com/android/camera/ui/ProMode.java @@ -62,10 +62,9 @@ public class ProMode extends View { private static final int BLUE = 0xff4693fb; private static final int SELECTED_DOT_SIZE = 20; private static final int DOT_SIZE = 10; - private static final int[] wbIcons = {R.drawable.auto, R.drawable.incandecent, - R.drawable.fluorescent, R.drawable.sunlight, R.drawable.cloudy}; - private static final int[] wbIconsBlue = {R.drawable.auto_blue, R.drawable.incandecent_blue, - R.drawable.fluorescent_blue, R.drawable.sunlight_blue, R.drawable.cloudy_blue}; + private static final int[] wbIcons = {R.drawable.ic_scene_mode_auto_wb, + R.drawable.ic_scene_mode_backlight, R.drawable.ic_scene_mode_fluorescent, + R.drawable.ic_scene_mode_sunset, R.drawable.ic_scene_mode_cloudy}; private static final int WB_ICON_SIZE = 80; private PathMeasure mCurveMeasure; private int mCurveLeft; @@ -350,7 +349,7 @@ public class ProMode extends View { ((TextView) v).setTextColor(Color.WHITE); } else if (v instanceof ImageView) { if (mMode == WHITE_BALANCE_MODE) { - ((ImageView) v).setImageResource(wbIcons[mIndex]); + ((ImageView) v).setColorFilter(null); } } } @@ -362,7 +361,7 @@ public class ProMode extends View { ((TextView) v).setTextColor(BLUE); } else if (v instanceof ImageView) { if (mMode == WHITE_BALANCE_MODE) { - ((ImageView) v).setImageResource(wbIconsBlue[mIndex]); + ((ImageView) v).setColorFilter(BLUE); } } if (key != null) mSettingsManager.setValueIndex(key, mIndex); @@ -383,6 +382,7 @@ public class ProMode extends View { @Override public boolean onTouchEvent(MotionEvent event) { + mUI.closeModeSwitcher(true); if (mMode == MANUAL_MODE) { float slider = getSlider(event.getX(), event.getY()); if (slider >= 0) { |