diff options
| author | d34d <clark@cyngn.com> | 2015-03-25 13:29:46 -0700 |
|---|---|---|
| committer | d34d <clark@cyngn.com> | 2015-03-25 13:35:19 -0700 |
| commit | 631f9a575000a1e0595686016feed0c64b25b8b2 (patch) | |
| tree | 50ce75019cad0f83c92cf4bb8f201c80c18e7131 /src/com | |
| parent | a42841dfb14637a67a7b6ee00796c3c70613fe8f (diff) | |
| download | packages_apps_ThemeChooser-631f9a575000a1e0595686016feed0c64b25b8b2.tar.gz packages_apps_ThemeChooser-631f9a575000a1e0595686016feed0c64b25b8b2.tar.bz2 packages_apps_ThemeChooser-631f9a575000a1e0595686016feed0c64b25b8b2.zip | |
AppThemer: Don't handle touch event if disabled
While a theme is being applied we disable the theme list layout and
make sure touch events are not handled when disabled.
Change-Id: Idbdf5fe686bdd89db3019e71327f151694cb8473
REF: CHOOSER-68
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/cyngn/theme/perapptheming/PerAppThemeListLayout.java | 2 | ||||
| -rw-r--r-- | src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/cyngn/theme/perapptheming/PerAppThemeListLayout.java b/src/com/cyngn/theme/perapptheming/PerAppThemeListLayout.java index a1a753d..e475351 100644 --- a/src/com/cyngn/theme/perapptheming/PerAppThemeListLayout.java +++ b/src/com/cyngn/theme/perapptheming/PerAppThemeListLayout.java @@ -67,7 +67,7 @@ public class PerAppThemeListLayout extends FrameLayout { @Override public boolean onTouchEvent(MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_DOWN && mWindow != null) { + if (isEnabled() && event.getAction() == MotionEvent.ACTION_DOWN && mWindow != null) { mWindow.hideThemeList(); return true; } diff --git a/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java b/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java index 48e29f3..7e3694a 100644 --- a/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java +++ b/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java @@ -647,6 +647,7 @@ public class PerAppThemingWindow extends Service implements OnTouchListener, private void showScrim() { ValueAnimator animator = ValueAnimator.ofArgb(SCRIM_COLOR_TRANSPARENT, SCRIM_COLOR_OPAQUE); + mThemeListLayout.setEnabled(false); animator.setDuration(ANIMATION_DURATION) .addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { @Override |