summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-08-15 17:39:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-08-15 17:39:24 +0000
commit9e26e26f0057b5c19248238ff869aba2930b7f56 (patch)
treeff7bcd8549d9c48443d0f5418cd97e241ce89b8c /src
parentb6398a1eb8b69651e0f901a93d7b46347e5d6a83 (diff)
parent1502c673d022ced571382e23302eb4a0aba72f9c (diff)
downloadandroid_packages_apps_Trebuchet-9e26e26f0057b5c19248238ff869aba2930b7f56.tar.gz
android_packages_apps_Trebuchet-9e26e26f0057b5c19248238ff869aba2930b7f56.tar.bz2
android_packages_apps_Trebuchet-9e26e26f0057b5c19248238ff869aba2930b7f56.zip
Merge "Prevent the work mode switch thumb from being dragged." into ub-launcher3-master
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/allapps/WorkModeSwitch.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index d766398ff..717bbd459 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -20,6 +20,7 @@ import android.os.AsyncTask;
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 @@ public class WorkModeSwitch extends Switch {
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();
}