commit 9e26e26f0057b5c19248238ff869aba2930b7f56
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 15 17:39:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 15 17:39:24 2018 +0000
tree ff7bcd8549d9c48443d0f5418cd97e241ce89b8c
parent b6398a1eb8b69651e0f901a93d7b46347e5d6a83
parent 1502c673d022ced571382e23302eb4a0aba72f9c

Merge "Prevent the work mode switch thumb from being dragged." into ub-launcher3-master

src/com/android/launcher3/allapps/WorkModeSwitch.java

diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index d766398..717bbd4 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -20,6 +20,7 @@
 import android.os.Process;
 import android.os.UserHandle;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 import android.widget.Switch;
 
 import com.android.launcher3.compat.UserManagerCompat;
@@ -61,6 +62,11 @@
         setEnabled(true);
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        return ev.getActionMasked() == MotionEvent.ACTION_MOVE || super.onTouchEvent(ev);
+    }
+
     private void trySetQuietModeEnabledToAllProfilesAsync(boolean enabled) {
         new SetQuietModeEnabledAsyncTask(enabled, new WeakReference<>(this)).execute();
     }