From 089aed8bb8bd74978f303624cb1673890d49c065 Mon Sep 17 00:00:00 2001
From: Jernej Virag <jernej@google.com>
Date: Tue, 11 May 2021 14:52:27 +0000
Subject: [PATCH] Add a setting to enable or disable corner invocation of
 assistant app

This setting allows the user to disable the bottom corner swipe gesture when they have system navigation set to corner gestures.

Bug: 179673792
Test: Verified on a physical device
      Ran robolectric unit tests for gesture settings package
Change-Id: Ib4e818e884c36ddfafaf4e8c75d81e01a13a5831
---
 res/values/strings.xml                        |   7 +
 res/xml/gesture_navigation_settings.xml       |  14 ++
 ...ureNavigationSettingsAssistController.java |  55 ++++++++
 ...avigationSettingsAssistControllerTest.java | 120 ++++++++++++++++++
 4 files changed, 196 insertions(+)
 create mode 100644 src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
 create mode 100644 tests/robotests/src/com/android/settings/gestures/GestureNavigationSettingsAssistControllerTest.java

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0b4b7057fd5..efbd9c1c47c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11612,6 +11612,13 @@
     <!-- Positive button for the alert dialog when gesture nav not supported by launcher [CHAR LIMIT=60] -->
     <string name="gesture_not_supported_positive_button">Switch default home app</string>
 
+    <!-- Title for setting category that is shown to enable invoking digital assistant with swipe. [CHAR LIMIT=60] -->
+    <string name="assistant_gesture_category_title">Digital assistant</string>
+    <!-- Title text for swiping from bottom corners to invoke the digital assistant app. [CHAR LIMIT=60] -->
+    <string name="assistant_corner_gesture_title">Swipe to invoke assistant</string>
+    <!-- Summary text for swiping from bottom corners to invoke the digital assistant app. [CHAR LIMIT=NONE] -->
+    <string name="assistant_corner_gesture_summary">Swipe up from a bottom corner corner to invoke digital assistant app.</string>
+
     <!-- Content description for the Information icon [CHAR LIMIT=30] -->
     <string name="information_label">Information</string>
 
diff --git a/res/xml/gesture_navigation_settings.xml b/res/xml/gesture_navigation_settings.xml
index 0515d78649f..09bb870e49e 100644
--- a/res/xml/gesture_navigation_settings.xml
+++ b/res/xml/gesture_navigation_settings.xml
@@ -23,6 +23,20 @@
     android:title="@string/gesture_settings_activity_title"
     settings:keywords="@string/keywords_gesture_navigation_settings">
 
+    <PreferenceCategory
+        android:key="assistant_gesture_category"
+        android:persistent="false"
+        android:title="@string/assistant_gesture_category_title">
+
+        <SwitchPreference
+            android:key="assistant_gesture_corner_swipe"
+            android:title="@string/assistant_corner_gesture_title"
+            android:summary="@string/assistant_corner_gesture_summary"
+            settings:controller="com.android.settings.gestures.GestureNavigationSettingsAssistController"
+        />
+
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="back_sensitivity_category"
         android:persistent="false"
diff --git a/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java b/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
new file mode 100644
index 00000000000..5c495382f2a
--- /dev/null
+++ b/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Configures behaviour of corner swipe to invoke assistant app gesture.
+ */
+public class GestureNavigationSettingsAssistController extends TogglePreferenceController {
+
+    // This value is based on SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
+    // behaviour. We assume that the gestures are enabled by default.
+    private static final int ASSIST_TOUCH_GESTURE_DEFAULT_VALUE = 1;
+
+    public GestureNavigationSettingsAssistController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, ASSIST_TOUCH_GESTURE_DEFAULT_VALUE)
+                == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, isChecked ? 1 : 0);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return SystemNavigationPreferenceController.isGestureAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/GestureNavigationSettingsAssistControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GestureNavigationSettingsAssistControllerTest.java
new file mode 100644
index 00000000000..e0dadee850c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/GestureNavigationSettingsAssistControllerTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.internal.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class GestureNavigationSettingsAssistControllerTest {
+
+    private static final String KEY_SWIPE_FOR_ASSIST = "assistant_gesture_corner_swipe";
+    private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
+    private GestureNavigationSettingsAssistController mController;
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+
+        // This sets up SystemNavigationPreferenceController.isGestureAvailable() so it returns true
+        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
+                true);
+        final String recentsComponentPackageName = "recents.component";
+        SettingsShadowResources.overrideResource(R.string.config_recentsComponentName,
+                recentsComponentPackageName + "/.ComponentName");
+        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
+                .setPackage(recentsComponentPackageName);
+        final ResolveInfo info = new ResolveInfo();
+        info.serviceInfo = new ServiceInfo();
+        info.resolvePackageName = recentsComponentPackageName;
+        info.serviceInfo.packageName = info.resolvePackageName;
+        info.serviceInfo.name = recentsComponentPackageName;
+        info.serviceInfo.applicationInfo = new ApplicationInfo();
+        info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
+        ShadowPackageManager shadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+        shadowPackageManager.addResolveInfoForIntent(quickStepIntent, info);
+
+        mController = new GestureNavigationSettingsAssistController(mContext, KEY_SWIPE_FOR_ASSIST);
+    }
+
+    @Test
+    public void isAvailable_systemNavigationControllerReturnsTrue_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_systemNavigationControllerReturnsFalse_shouldReturnFalse() {
+        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
+                false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_noDefault_true() {
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_valueFalse_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, 0);
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_valueTrue_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, 1);
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_valueTrue() {
+        mController.onPreferenceChange(null, true);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, -1)).isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceUnchecked_valueFalse() {
+        mController.onPreferenceChange(null, false);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, -1)).isEqualTo(0);
+    }
+}