Refactors the System Navigation settings page
Bug: 130915285
Bug: 128855215
Bug: 127718810
Bug: 129115299
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Change-Id: If11e1fe4bf150d2dd9578f731e71abf6b74f5d90
diff --git a/res/drawable-nodpi/gesture_swipe_up.png b/res/drawable-nodpi/system_nav_2_button.png
similarity index 100%
rename from res/drawable-nodpi/gesture_swipe_up.png
rename to res/drawable-nodpi/system_nav_2_button.png
Binary files differ
diff --git a/res/drawable-nodpi/system_nav_3_button.png b/res/drawable-nodpi/system_nav_3_button.png
new file mode 100644
index 0000000..e78fc8b
--- /dev/null
+++ b/res/drawable-nodpi/system_nav_3_button.png
Binary files differ
diff --git a/res/drawable-nodpi/system_nav_fully_gestural.png b/res/drawable-nodpi/system_nav_fully_gestural.png
new file mode 100644
index 0000000..b301608
--- /dev/null
+++ b/res/drawable-nodpi/system_nav_fully_gestural.png
Binary files differ
diff --git a/res/raw/gesture_swipe_up.mp4 b/res/raw/system_nav_2_button.mp4
similarity index 100%
rename from res/raw/gesture_swipe_up.mp4
rename to res/raw/system_nav_2_button.mp4
Binary files differ
diff --git a/res/raw/system_nav_3_button.mp4 b/res/raw/system_nav_3_button.mp4
new file mode 100644
index 0000000..1287f28
--- /dev/null
+++ b/res/raw/system_nav_3_button.mp4
Binary files differ
diff --git a/res/raw/system_nav_fully_gestural.mp4 b/res/raw/system_nav_fully_gestural.mp4
new file mode 100644
index 0000000..165ce33
--- /dev/null
+++ b/res/raw/system_nav_fully_gestural.mp4
Binary files differ
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 5dcb1b0..ff3a6b5 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -49,7 +49,7 @@
android:key="gesture_system_navigation_input_summary"
android:title="@string/system_navigation_title"
android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
- settings:controller="com.android.settings.gestures.SystemNavigationLegacyPreferenceController" />
+ settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController" />
<Preference
android:key="gesture_tap_screen_input_summary"
diff --git a/res/xml/system_navigation_gesture_settings.xml b/res/xml/system_navigation_gesture_settings.xml
index 97aacb8..b1045fc 100644
--- a/res/xml/system_navigation_gesture_settings.xml
+++ b/res/xml/system_navigation_gesture_settings.xml
@@ -17,35 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="gesture_system_navigation_screen"
- android:title="@string/system_navigation_title">
-
- <com.android.settings.widget.VideoPreference
- android:key="gesture_swipe_up_video"
- app:animation="@raw/gesture_swipe_up"
- app:preview="@drawable/gesture_swipe_up" />
-
- <com.android.settings.widget.RadioButtonPreference
- android:key="gesture_edge_to_edge"
- android:title="@string/edge_to_edge_navigation_title"
- android:summary="@string/edge_to_edge_navigation_summary"
- app:keywords="@string/keywords_gesture"
- app:controller="com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController"
- app:allowDividerAbove="true" />
-
- <com.android.settings.widget.RadioButtonPreference
- android:key="gesture_swipe_up"
- android:title="@string/swipe_up_to_switch_apps_title"
- android:summary="@string/swipe_up_to_switch_apps_summary"
- app:keywords="@string/keywords_gesture"
- app:controller="com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController" />
-
- <com.android.settings.widget.RadioButtonPreference
- android:key="gesture_legacy"
- android:title="@string/legacy_navigation_title"
- android:summary="@string/legacy_navigation_summary"
- app:keywords="@string/keywords_gesture"
- app:controller="com.android.settings.gestures.SystemNavigationLegacyPreferenceController" />
-
-</PreferenceScreen>
\ No newline at end of file
+ android:title="@string/system_navigation_title"
+ settings:keywords="@string/keywords_system_navigation"/>
diff --git a/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java b/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java
deleted file mode 100644
index 0c5adc4..0000000
--- a/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
-
-import android.content.Context;
-import android.content.om.IOverlayManager;
-import android.os.ServiceManager;
-import android.text.TextUtils;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.widget.RadioButtonPreference;
-
-public class SystemNavigationEdgeToEdgePreferenceController extends
- SystemNavigationPreferenceController {
- static final String PREF_KEY_EDGE_TO_EDGE = "gesture_edge_to_edge";
-
- public SystemNavigationEdgeToEdgePreferenceController(Context context, String key) {
- this(context, IOverlayManager.Stub.asInterface(ServiceManager.getService(
- Context.OVERLAY_SERVICE)), key);
- }
-
- @VisibleForTesting
- public SystemNavigationEdgeToEdgePreferenceController(Context context,
- IOverlayManager overlayManager, String key) {
- super(context, overlayManager, key, NAV_BAR_MODE_GESTURAL_OVERLAY);
- }
-
- @Override
- public void onRadioButtonClicked(RadioButtonPreference preference) {
- setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_GESTURAL_OVERLAY);
- selectRadioButtonInGroup(PREF_KEY_EDGE_TO_EDGE, mPreferenceScreen);
- }
-
- @Override
- public boolean isChecked() {
- return isEdgeToEdgeEnabled(mContext);
- }
-}
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index ea5454b..e17b870 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -16,29 +16,58 @@
package com.android.settings.gestures;
+import static android.os.UserHandle.USER_CURRENT;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
+
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
+import android.content.om.IOverlayManager;
+import android.graphics.drawable.Drawable;
+import android.os.RemoteException;
+import android.os.ServiceManager;
import android.provider.SearchIndexableResource;
+import android.view.View;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.widget.VideoPreference;
import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.CandidateInfo;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
-public class SystemNavigationGestureSettings extends DashboardFragment {
+public class SystemNavigationGestureSettings extends RadioButtonPickerFragment {
private static final String TAG = "SystemNavigationGesture";
+ @VisibleForTesting
+ static final String KEY_SYSTEM_NAV_3BUTTONS = "system_nav_3buttons";
+ @VisibleForTesting
+ static final String KEY_SYSTEM_NAV_2BUTTONS = "system_nav_2buttons";
+ @VisibleForTesting
+ static final String KEY_SYSTEM_NAV_GESTURAL = "system_nav_gestural";
+
public static final String PREF_KEY_SUGGESTION_COMPLETE =
"pref_system_navigation_suggestion_complete";
+ private IOverlayManager mOverlayManager;
+
+ private VideoPreference mVideoPreference;
+
@Override
public void onAttach(Context context) {
super.onAttach(context);
@@ -46,6 +75,12 @@
.getSuggestionFeatureProvider(context);
SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
+
+ mOverlayManager = IOverlayManager.Stub.asInterface(
+ ServiceManager.getService(Context.OVERLAY_SERVICE));
+
+ mVideoPreference = new VideoPreference(context);
+ setIllustrationVideo(mVideoPreference, getDefaultKey());
}
@Override
@@ -54,16 +89,153 @@
}
@Override
- protected String getLogTag() {
- return TAG;
- }
-
- @Override
protected int getPreferenceScreenResId() {
return R.xml.system_navigation_gesture_settings;
}
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ @Override
+ protected void addStaticPreferences(PreferenceScreen screen) {
+ screen.addPreference(mVideoPreference);
+ }
+
+ @Override
+ protected List<? extends CandidateInfo> getCandidates() {
+ final Context c = getContext();
+ List<NavModeCandidateInfo> candidates = new ArrayList<>();
+
+ if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,
+ NAV_BAR_MODE_GESTURAL_OVERLAY)) {
+ candidates.add(new NavModeCandidateInfo(
+ c.getText(R.string.edge_to_edge_navigation_title),
+ c.getText(R.string.edge_to_edge_navigation_summary),
+ KEY_SYSTEM_NAV_GESTURAL, true /* enabled */));
+ }
+ if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,
+ NAV_BAR_MODE_2BUTTON_OVERLAY)) {
+ candidates.add(new NavModeCandidateInfo(
+ c.getText(R.string.swipe_up_to_switch_apps_title),
+ c.getText(R.string.swipe_up_to_switch_apps_summary),
+ KEY_SYSTEM_NAV_2BUTTONS, true /* enabled */));
+ }
+ if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,
+ NAV_BAR_MODE_3BUTTON_OVERLAY)) {
+ candidates.add(new NavModeCandidateInfo(
+ c.getText(R.string.legacy_navigation_title),
+ c.getText(R.string.legacy_navigation_summary),
+ KEY_SYSTEM_NAV_3BUTTONS, true /* enabled */));
+ }
+
+ return candidates;
+ }
+
+ @Override
+ protected String getDefaultKey() {
+ return getCurrentSystemNavigationMode(getContext());
+ }
+
+ @Override
+ protected boolean setDefaultKey(String key) {
+ setCurrentSystemNavigationMode(mOverlayManager, key);
+ setIllustrationVideo(mVideoPreference, key);
+ return true;
+ }
+
+ @VisibleForTesting
+ static String getCurrentSystemNavigationMode(Context context) {
+ if (SystemNavigationPreferenceController.isEdgeToEdgeEnabled(context)) {
+ return KEY_SYSTEM_NAV_GESTURAL;
+ } else if (SystemNavigationPreferenceController.isSwipeUpEnabled(context)) {
+ return KEY_SYSTEM_NAV_2BUTTONS;
+ } else {
+ return KEY_SYSTEM_NAV_3BUTTONS;
+ }
+ }
+
+ @VisibleForTesting
+ static void setCurrentSystemNavigationMode(IOverlayManager overlayManager, String key) {
+ switch (key) {
+ case KEY_SYSTEM_NAV_GESTURAL:
+ setNavBarInteractionMode(overlayManager, NAV_BAR_MODE_GESTURAL_OVERLAY);
+ break;
+ case KEY_SYSTEM_NAV_2BUTTONS:
+ setNavBarInteractionMode(overlayManager, NAV_BAR_MODE_2BUTTON_OVERLAY);
+ break;
+ case KEY_SYSTEM_NAV_3BUTTONS:
+ setNavBarInteractionMode(overlayManager, NAV_BAR_MODE_3BUTTON_OVERLAY);
+ break;
+ }
+ }
+
+ /**
+ * Enables the specified overlay package.
+ */
+ static void setNavBarInteractionMode(IOverlayManager overlayManager, String overlayPackage) {
+ try {
+ overlayManager.setEnabledExclusiveInCategory(overlayPackage, USER_CURRENT);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ static void setIllustrationVideo(VideoPreference videoPref, String systemNavKey) {
+ videoPref.setVideo(0, 0);
+ switch (systemNavKey) {
+ case KEY_SYSTEM_NAV_GESTURAL:
+ videoPref.setVideo(R.raw.system_nav_fully_gestural,
+ R.drawable.system_nav_fully_gestural);
+ break;
+ case KEY_SYSTEM_NAV_2BUTTONS:
+ videoPref.setVideo(R.raw.system_nav_2_button, R.drawable.system_nav_2_button);
+ break;
+ case KEY_SYSTEM_NAV_3BUTTONS:
+ videoPref.setVideo(R.raw.system_nav_3_button, R.drawable.system_nav_3_button);
+ break;
+ }
+ }
+
+ @Override
+ public void bindPreferenceExtra(RadioButtonPreference pref,
+ String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
+ if (info instanceof NavModeCandidateInfo) {
+ pref.setSummary(((NavModeCandidateInfo) info).loadSummary());
+ pref.setAppendixVisibility(View.GONE);
+ }
+ }
+
+ static class NavModeCandidateInfo extends CandidateInfo {
+ private final CharSequence mLabel;
+ private final CharSequence mSummary;
+ private final String mKey;
+
+ NavModeCandidateInfo(CharSequence label, CharSequence summary, String key,
+ boolean enabled) {
+ super(enabled);
+ mLabel = label;
+ mSummary = summary;
+ mKey = key;
+ }
+
+ @Override
+ public CharSequence loadLabel() {
+ return mLabel;
+ }
+
+ public CharSequence loadSummary() {
+ return mSummary;
+ }
+
+ @Override
+ public Drawable loadIcon() {
+ return null;
+ }
+
+ @Override
+ public String getKey() {
+ return mKey;
+ }
+ }
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
diff --git a/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java
deleted file mode 100644
index 7ac9a03..0000000
--- a/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
-
-import android.content.Context;
-import android.content.om.IOverlayManager;
-import android.os.ServiceManager;
-import android.text.TextUtils;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.widget.RadioButtonPreference;
-
-public class SystemNavigationLegacyPreferenceController extends
- SystemNavigationPreferenceController {
- static final String PREF_KEY_LEGACY = "gesture_legacy";
-
- public SystemNavigationLegacyPreferenceController(Context context, String key) {
- this(context, IOverlayManager.Stub.asInterface(ServiceManager.getService(
- Context.OVERLAY_SERVICE)), key);
- }
-
- @VisibleForTesting
- public SystemNavigationLegacyPreferenceController(Context context,
- IOverlayManager overlayManager, String key) {
- super(context, overlayManager, key, NAV_BAR_MODE_3BUTTON_OVERLAY);
- }
-
- @Override
- public void onRadioButtonClicked(RadioButtonPreference preference) {
- setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_3BUTTON_OVERLAY);
- selectRadioButtonInGroup(PREF_KEY_LEGACY, mPreferenceScreen);
- }
-
- @Override
- public boolean isChecked() {
- return !isEdgeToEdgeEnabled(mContext) && !isSwipeUpEnabled(mContext);
- }
-}
diff --git a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
index 664e7bb..d0d8155 100644
--- a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
+++ b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
@@ -16,79 +16,29 @@
package com.android.settings.gestures;
-import static android.os.UserHandle.USER_CURRENT;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.om.IOverlayManager;
import android.content.pm.PackageManager;
-import android.os.RemoteException;
-import android.text.TextUtils;
-import android.view.View;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.core.BasePreferenceController;
-public abstract class SystemNavigationPreferenceController extends GesturePreferenceController
- implements RadioButtonPreference.OnClickListener {
+public class SystemNavigationPreferenceController extends BasePreferenceController {
+ static final String PREF_KEY_SYSTEM_NAVIGATION = "gesture_system_navigation";
private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
- private static final String PREF_KEY_VIDEO = "gesture_swipe_up_video";
- private static final String[] RADIO_BUTTONS_IN_GROUP = {
- SystemNavigationLegacyPreferenceController.PREF_KEY_LEGACY,
- SystemNavigationSwipeUpPreferenceController.PREF_KEY_SWIPE_UP,
- SystemNavigationEdgeToEdgePreferenceController.PREF_KEY_EDGE_TO_EDGE,
- };
-
- protected final IOverlayManager mOverlayManager;
- protected PreferenceScreen mPreferenceScreen;
- private final String mOverlayPackage;
-
- public SystemNavigationPreferenceController(Context context, IOverlayManager overlayManager,
- String key, String overlayPackage) {
+ public SystemNavigationPreferenceController(Context context, String key) {
super(context, key);
- mOverlayManager = overlayManager;
- mOverlayPackage = overlayPackage;
}
@Override
public int getAvailabilityStatus() {
- return isGestureAvailable(mContext, mOverlayPackage) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mPreferenceScreen = screen;
-
- Preference preference = screen.findPreference(getPreferenceKey());
- if (preference != null && preference instanceof RadioButtonPreference) {
- RadioButtonPreference radioPreference = (RadioButtonPreference) preference;
- radioPreference.setOnClickListener(this);
- radioPreference.setAppendixVisibility(View.GONE);
- }
- }
-
- @Override
- public boolean setChecked(boolean isChecked) {
- if (!isChecked || mPreferenceScreen == null) {
- return false;
- }
- Preference preference = mPreferenceScreen.findPreference(getPreferenceKey());
- if (preference != null && preference instanceof RadioButtonPreference) {
- onRadioButtonClicked((RadioButtonPreference) preference);
- }
- return true;
+ return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
@@ -102,17 +52,7 @@
}
}
- @Override
- protected String getVideoPrefKey() {
- return PREF_KEY_VIDEO;
- }
-
-
static boolean isGestureAvailable(Context context) {
- return isGestureAvailable(context, null /* overlayPackage */);
- }
-
- static boolean isGestureAvailable(Context context, String overlayPackage) {
// Skip if the swipe up settings are not available
if (!context.getResources().getBoolean(
com.android.internal.R.bool.config_swipe_up_gesture_setting_available)) {
@@ -127,44 +67,22 @@
}
// Skip if the overview proxy service exists
- final PackageManager pm = context.getPackageManager();
final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
.setPackage(recentsComponentName.getPackageName());
- if (pm.resolveService(quickStepIntent, PackageManager.MATCH_SYSTEM_ONLY) == null) {
+ if (context.getPackageManager().resolveService(quickStepIntent,
+ PackageManager.MATCH_SYSTEM_ONLY) == null) {
return false;
}
- // Skip if the required overlay package is defined but doesn't exist
- if (overlayPackage != null) {
- try {
- return pm.getPackageInfo(overlayPackage, 0 /* flags */) != null;
- } catch (PackageManager.NameNotFoundException e) {
- // Not found, just return unavailable
- return false;
- }
- }
-
return true;
}
- static void selectRadioButtonInGroup(String preferenceKey, PreferenceScreen screen) {
- if (screen == null) {
- return;
- }
- for (String key : RADIO_BUTTONS_IN_GROUP) {
- ((RadioButtonPreference) screen.findPreference(key)).setChecked(
- TextUtils.equals(key, preferenceKey));
- }
- }
-
- /**
- * Enables the specified overlay package.
- */
- static void setNavBarInteractionMode(IOverlayManager overlayManager, String overlayPackage) {
+ static boolean isOverlayPackageAvailable(Context context, String overlayPackage) {
try {
- overlayManager.setEnabledExclusiveInCategory(overlayPackage, USER_CURRENT);
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
+ return context.getPackageManager().getPackageInfo(overlayPackage, 0) != null;
+ } catch (PackageManager.NameNotFoundException e) {
+ // Not found, just return unavailable
+ return false;
}
}
diff --git a/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java
deleted file mode 100644
index 592b231..0000000
--- a/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
-
-import android.content.Context;
-import android.content.om.IOverlayManager;
-import android.os.ServiceManager;
-import android.text.TextUtils;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.widget.RadioButtonPreference;
-
-public class SystemNavigationSwipeUpPreferenceController extends
- SystemNavigationPreferenceController {
- static final String PREF_KEY_SWIPE_UP = "gesture_swipe_up";
-
- public SystemNavigationSwipeUpPreferenceController(Context context, String key) {
- this(context, IOverlayManager.Stub.asInterface(ServiceManager.getService(
- Context.OVERLAY_SERVICE)), key);
- }
-
- @VisibleForTesting
- public SystemNavigationSwipeUpPreferenceController(Context context,
- IOverlayManager overlayManager, String key) {
- super(context, overlayManager, key, NAV_BAR_MODE_2BUTTON_OVERLAY);
- }
-
- @Override
- public void onRadioButtonClicked(RadioButtonPreference preference) {
- setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_2BUTTON_OVERLAY);
- selectRadioButtonInGroup(PREF_KEY_SWIPE_UP, mPreferenceScreen);
- }
-
- @Override
- public boolean isChecked() {
- return isSwipeUpEnabled(mContext);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java
deleted file mode 100644
index 5c02101..0000000
--- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
-
-import static com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController.PREF_KEY_EDGE_TO_EDGE;
-import static com.android.settings.gestures.SystemNavigationLegacyPreferenceController.PREF_KEY_LEGACY;
-import static com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController.PREF_KEY_SWIPE_UP;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.om.IOverlayManager;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.R;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.widget.RadioButtonPreference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.class)
-public class SystemNavigationEdgeToEdgePreferenceControllerTest {
-
- private Context mContext;
- private ShadowPackageManager mPackageManager;
-
- @Mock
- private IOverlayManager mOverlayManager;
-
- private SystemNavigationEdgeToEdgePreferenceController mController;
-
- private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
- true);
-
- mContext = RuntimeEnvironment.application;
- mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
-
- mController = new SystemNavigationEdgeToEdgePreferenceController(mContext, mOverlayManager,
- PREF_KEY_EDGE_TO_EDGE);
- }
-
- @After
- public void tearDown() {
- SettingsShadowResources.reset();
- }
-
- @Test
- public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
- final ComponentName recentsComponentName = ComponentName.unflattenFromString(
- mContext.getString(com.android.internal.R.string.config_recentsComponentName));
- final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
- .setPackage(recentsComponentName.getPackageName());
- final ResolveInfo info = new ResolveInfo();
- info.serviceInfo = new ServiceInfo();
- info.resolvePackageName = recentsComponentName.getPackageName();
- info.serviceInfo.packageName = info.resolvePackageName;
- info.serviceInfo.name = recentsComponentName.getClassName();
- info.serviceInfo.applicationInfo = new ApplicationInfo();
- info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
- mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
-
- assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext))
- .isTrue();
- }
-
- @Test
- public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
- SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
- false);
-
- final ComponentName recentsComponentName = ComponentName.unflattenFromString(
- mContext.getString(com.android.internal.R.string.config_recentsComponentName));
- final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
- .setPackage(recentsComponentName.getPackageName());
- mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
-
- assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext))
- .isFalse();
- }
-
- @Test
- public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
- assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext))
- .isFalse();
- }
-
- @Test
- public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
- assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext,
- "com.package.fake")).isFalse();
- }
-
- @Test
- public void testIsChecked_defaultIsEdgeToEdge_shouldReturnTrue() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_GESTURAL);
- assertThat(mController.isChecked()).isTrue();
- }
-
- @Test
- public void testIsChecked_defaultIsLegacy_shouldReturnFalse() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_3BUTTON);
- assertThat(mController.isChecked()).isFalse();
- }
-
- @Test
- public void testIsChecked_defaultIsSwipeUp_shouldReturnFalse() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_2BUTTON);
- assertThat(mController.isChecked()).isFalse();
- }
-
- @Test
- public void testIsChecked_radioButtonClicked_shouldReturnTrue() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_GESTURAL);
- // Set the setting to be enabled.
- mController.onRadioButtonClicked(null);
- assertThat(mController.isChecked()).isTrue();
- }
-
- @Test
- public void testOnRadioButtonClicked_setsCorrectRadioButtonChecked() {
- RadioButtonPreference radioLegacy = mock(RadioButtonPreference.class);
- RadioButtonPreference radioSwipeUp = mock(RadioButtonPreference.class);
- RadioButtonPreference radioEdgeToEdge = mock(RadioButtonPreference.class);
- PreferenceScreen screen = mock(PreferenceScreen.class);
-
- when(screen.findPreference(PREF_KEY_LEGACY)).thenReturn(radioLegacy);
- when(screen.findPreference(PREF_KEY_SWIPE_UP)).thenReturn(radioSwipeUp);
- when(screen.findPreference(PREF_KEY_EDGE_TO_EDGE)).thenReturn(radioEdgeToEdge);
-
- mController.displayPreference(screen);
- mController.onRadioButtonClicked(radioEdgeToEdge);
-
- verify(radioLegacy, times(1)).setChecked(false);
- verify(radioSwipeUp, times(1)).setChecked(false);
- verify(radioEdgeToEdge, times(1)).setChecked(true);
- }
-
- @Test
- public void isSliceable_returnsFalse() {
- assertThat(mController.isSliceable()).isFalse();
- }
-
- @Test
- public void isSliceableIncorrectKey_returnsFalse() {
- final SystemNavigationEdgeToEdgePreferenceController controller =
- new SystemNavigationEdgeToEdgePreferenceController(mContext, "bad_key");
- assertThat(controller.isSliceable()).isFalse();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationGestureSettingsTest.java
new file mode 100644
index 0000000..1f3a758
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/SystemNavigationGestureSettingsTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2019 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 android.os.UserHandle.USER_CURRENT;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
+
+import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_2BUTTONS;
+import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_3BUTTONS;
+import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_GESTURAL;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.om.IOverlayManager;
+import android.os.ServiceManager;
+import android.provider.SearchIndexableResource;
+import android.text.TextUtils;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class SystemNavigationGestureSettingsTest {
+
+ private Context mContext;
+
+ private IOverlayManager mOverlayManager;
+
+ private SystemNavigationGestureSettings mSettings;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mOverlayManager = mock(IOverlayManager.class);
+
+ mSettings = new SystemNavigationGestureSettings();
+ }
+
+ @Test
+ public void testSearchIndexProvider_shouldIndexResource() {
+ final List<SearchIndexableResource> indexRes =
+ SystemNavigationGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.application, true /* enabled */);
+
+ assertThat(indexRes).isNotNull();
+ assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+ }
+
+ @Test
+ public void testGetCurrentSystemNavigationMode() {
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_GESTURAL);
+ assertThat(TextUtils.equals(mSettings.getCurrentSystemNavigationMode(mContext),
+ KEY_SYSTEM_NAV_GESTURAL)).isTrue();
+
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_3BUTTON);
+ assertThat(TextUtils.equals(mSettings.getCurrentSystemNavigationMode(mContext),
+ KEY_SYSTEM_NAV_3BUTTONS)).isTrue();
+
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_2BUTTON);
+ assertThat(TextUtils.equals(mSettings.getCurrentSystemNavigationMode(mContext),
+ KEY_SYSTEM_NAV_2BUTTONS)).isTrue();
+ }
+
+ @Test
+ public void testSetCurrentSystemNavigationMode() throws Exception {
+ mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_GESTURAL);
+ verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
+ NAV_BAR_MODE_GESTURAL_OVERLAY, USER_CURRENT);
+
+ mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_2BUTTONS);
+ verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
+ NAV_BAR_MODE_2BUTTON_OVERLAY, USER_CURRENT);
+
+ mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_3BUTTONS);
+ verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
+ NAV_BAR_MODE_3BUTTON_OVERLAY, USER_CURRENT);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java
deleted file mode 100644
index ebb1eb0..0000000
--- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
-
-import static com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController.PREF_KEY_EDGE_TO_EDGE;
-import static com.android.settings.gestures.SystemNavigationLegacyPreferenceController.PREF_KEY_LEGACY;
-import static com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController.PREF_KEY_SWIPE_UP;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.om.IOverlayManager;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.R;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.widget.RadioButtonPreference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.class)
-public class SystemNavigationLegacyPreferenceControllerTest {
-
- private Context mContext;
- private ShadowPackageManager mPackageManager;
-
- @Mock
- private IOverlayManager mOverlayManager;
-
- private SystemNavigationLegacyPreferenceController mController;
-
- private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
- true);
-
- mContext = RuntimeEnvironment.application;
- mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
-
- mController = new SystemNavigationLegacyPreferenceController(mContext, mOverlayManager,
- PREF_KEY_LEGACY);
- }
-
- @After
- public void tearDown() {
- SettingsShadowResources.reset();
- }
-
- @Test
- public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
- final ComponentName recentsComponentName = ComponentName.unflattenFromString(
- mContext.getString(com.android.internal.R.string.config_recentsComponentName));
- final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
- .setPackage(recentsComponentName.getPackageName());
- final ResolveInfo info = new ResolveInfo();
- info.serviceInfo = new ServiceInfo();
- info.resolvePackageName = recentsComponentName.getPackageName();
- info.serviceInfo.packageName = info.resolvePackageName;
- info.serviceInfo.name = recentsComponentName.getClassName();
- info.serviceInfo.applicationInfo = new ApplicationInfo();
- info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
- mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
-
- assertThat(SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext))
- .isTrue();
- }
-
- @Test
- public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
- SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
- false);
-
- final ComponentName recentsComponentName = ComponentName.unflattenFromString(
- mContext.getString(com.android.internal.R.string.config_recentsComponentName));
- final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
- .setPackage(recentsComponentName.getPackageName());
- mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
-
- assertThat(
- SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext)).isFalse();
- }
-
- @Test
- public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
- assertThat(
- SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext)).isFalse();
- }
-
- @Test
- public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
- assertThat(SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext,
- "com.package.fake")).isFalse();
- }
-
- @Test
- public void testIsChecked_defaultIsLegacy_shouldReturnTrue() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_3BUTTON);
- assertThat(mController.isChecked()).isTrue();
- }
-
- @Test
- public void testIsChecked_defaultIsSwipeUp_shouldReturnFalse() {
- // Turn on the Swipe Up mode (2-buttons)
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_2BUTTON);
- assertThat(mController.isChecked()).isFalse();
- }
-
- @Test
- public void testIsChecked_defaultIsEdgeToEdge_shouldReturnFalse() {
- // Turn on the Edge to Edge
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_GESTURAL);
- assertThat(mController.isChecked()).isFalse();
- }
-
- @Test
- public void testIsChecked_radioButtonClicked_shouldReturnTrue() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_3BUTTON);
- // Set the setting to be enabled.
- mController.onRadioButtonClicked(null);
- assertThat(mController.isChecked()).isTrue();
- }
-
- @Test
- public void testOnRadioButtonClicked_setsCorrectRadioButtonChecked() {
- RadioButtonPreference radioLegacy = mock(RadioButtonPreference.class);
- RadioButtonPreference radioSwipeUp = mock(RadioButtonPreference.class);
- RadioButtonPreference radioEdgeToEdge = mock(RadioButtonPreference.class);
- PreferenceScreen screen = mock(PreferenceScreen.class);
-
- when(screen.findPreference(PREF_KEY_LEGACY)).thenReturn(radioLegacy);
- when(screen.findPreference(PREF_KEY_SWIPE_UP)).thenReturn(radioSwipeUp);
- when(screen.findPreference(PREF_KEY_EDGE_TO_EDGE)).thenReturn(radioEdgeToEdge);
-
- mController.displayPreference(screen);
- mController.onRadioButtonClicked(radioLegacy);
-
- verify(radioLegacy, times(1)).setChecked(true);
- verify(radioSwipeUp, times(1)).setChecked(false);
- verify(radioEdgeToEdge, times(1)).setChecked(false);
- }
-
- @Test
- public void isSliceable_returnsFalse() {
- assertThat(mController.isSliceable()).isFalse();
- }
-
- @Test
- public void isSliceableIncorrectKey_returnsFalse() {
- final SystemNavigationLegacyPreferenceController controller =
- new SystemNavigationLegacyPreferenceController(mContext, "bad_key");
- assertThat(controller.isSliceable()).isFalse();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java
new file mode 100644
index 0000000..095c4d7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2019 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 android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
+
+import static com.android.settings.gestures.SystemNavigationPreferenceController.PREF_KEY_SYSTEM_NAVIGATION;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+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.text.TextUtils;
+
+import com.android.internal.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class SystemNavigationPreferenceControllerTest {
+
+ private Context mContext;
+ private ShadowPackageManager mPackageManager;
+
+ private SystemNavigationPreferenceController mController;
+
+ private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
+ true);
+
+ mContext = RuntimeEnvironment.application;
+ mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+
+ mController = new SystemNavigationPreferenceController(mContext,
+ PREF_KEY_SYSTEM_NAVIGATION);
+ }
+
+ @After
+ public void tearDown() {
+ SettingsShadowResources.reset();
+ }
+
+ @Test
+ public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
+ final ComponentName recentsComponentName = ComponentName.unflattenFromString(
+ mContext.getString(com.android.internal.R.string.config_recentsComponentName));
+ final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
+ .setPackage(recentsComponentName.getPackageName());
+ final ResolveInfo info = new ResolveInfo();
+ info.serviceInfo = new ServiceInfo();
+ info.resolvePackageName = recentsComponentName.getPackageName();
+ info.serviceInfo.packageName = info.resolvePackageName;
+ info.serviceInfo.name = recentsComponentName.getClassName();
+ info.serviceInfo.applicationInfo = new ApplicationInfo();
+ info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
+ mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
+
+ assertThat(SystemNavigationPreferenceController.isGestureAvailable(mContext)).isTrue();
+ }
+
+ @Test
+ public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
+ SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
+ false);
+
+ final ComponentName recentsComponentName = ComponentName.unflattenFromString(
+ mContext.getString(com.android.internal.R.string.config_recentsComponentName));
+ final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
+ .setPackage(recentsComponentName.getPackageName());
+ mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
+
+ assertThat(SystemNavigationPreferenceController.isGestureAvailable(mContext)).isFalse();
+ }
+
+ @Test
+ public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
+ assertThat(SystemNavigationPreferenceController.isGestureAvailable(mContext)).isFalse();
+ }
+
+ @Test
+ public void testIsOverlayPackageAvailable_noOverlayPackage_shouldReturnFalse() {
+ assertThat(SystemNavigationPreferenceController.isOverlayPackageAvailable(mContext,
+ "com.package.fake")).isFalse();
+ }
+
+ @Test
+ public void testIsSwipeUpEnabled() {
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_2BUTTON);
+ assertThat(SystemNavigationPreferenceController.isSwipeUpEnabled(mContext)).isTrue();
+
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_3BUTTON);
+ assertThat(SystemNavigationPreferenceController.isSwipeUpEnabled(mContext)).isFalse();
+
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_GESTURAL);
+ assertThat(SystemNavigationPreferenceController.isSwipeUpEnabled(mContext)).isFalse();
+ }
+
+ @Test
+ public void testIsEdgeToEdgeEnabled() {
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_GESTURAL);
+ assertThat(SystemNavigationPreferenceController.isEdgeToEdgeEnabled(mContext)).isTrue();
+
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_3BUTTON);
+ assertThat(SystemNavigationPreferenceController.isEdgeToEdgeEnabled(mContext)).isFalse();
+
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_2BUTTON);
+ assertThat(SystemNavigationPreferenceController.isEdgeToEdgeEnabled(mContext)).isFalse();
+ }
+
+ @Test
+ public void testGetSummary() {
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_GESTURAL);
+ assertThat(TextUtils.equals(mController.getSummary(), mContext.getText(
+ com.android.settings.R.string.edge_to_edge_navigation_title))).isTrue();
+
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_3BUTTON);
+ assertThat(TextUtils.equals(mController.getSummary(),
+ mContext.getText(com.android.settings.R.string.legacy_navigation_title))).isTrue();
+
+ SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+ NAV_BAR_MODE_2BUTTON);
+ assertThat(TextUtils.equals(mController.getSummary(), mContext.getText(
+ com.android.settings.R.string.swipe_up_to_switch_apps_title))).isTrue();
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java
deleted file mode 100644
index f8a0b58..0000000
--- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
-
-import static com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController.PREF_KEY_EDGE_TO_EDGE;
-import static com.android.settings.gestures.SystemNavigationLegacyPreferenceController.PREF_KEY_LEGACY;
-import static com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController.PREF_KEY_SWIPE_UP;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.om.IOverlayManager;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.R;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.widget.RadioButtonPreference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.class)
-public class SystemNavigationSwipeUpPreferenceControllerTest {
-
- private Context mContext;
- private ShadowPackageManager mPackageManager;
-
- @Mock
- private IOverlayManager mOverlayManager;
-
- private SystemNavigationSwipeUpPreferenceController mController;
-
- private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
- true);
-
- mContext = RuntimeEnvironment.application;
- mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
-
- mController = new SystemNavigationSwipeUpPreferenceController(mContext, mOverlayManager,
- PREF_KEY_SWIPE_UP);
- }
-
- @After
- public void tearDown() {
- SettingsShadowResources.reset();
- }
-
- @Test
- public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
- final ComponentName recentsComponentName = ComponentName.unflattenFromString(
- mContext.getString(com.android.internal.R.string.config_recentsComponentName));
- final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
- .setPackage(recentsComponentName.getPackageName());
- final ResolveInfo info = new ResolveInfo();
- info.serviceInfo = new ServiceInfo();
- info.resolvePackageName = recentsComponentName.getPackageName();
- info.serviceInfo.packageName = info.resolvePackageName;
- info.serviceInfo.name = recentsComponentName.getClassName();
- info.serviceInfo.applicationInfo = new ApplicationInfo();
- info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
- mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
-
- assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext))
- .isTrue();
- }
-
- @Test
- public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
- SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
- false);
-
- final ComponentName recentsComponentName = ComponentName.unflattenFromString(
- mContext.getString(com.android.internal.R.string.config_recentsComponentName));
- final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
- .setPackage(recentsComponentName.getPackageName());
- mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
-
- assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext))
- .isFalse();
- }
-
- @Test
- public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
- assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext))
- .isFalse();
- }
-
- @Test
- public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
- assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext,
- "com.package.fake")).isFalse();
- }
-
- @Test
- public void testIsChecked_defaultIsSwipeUp_shouldReturnTrue() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_2BUTTON);
- assertThat(mController.isChecked()).isTrue();
- }
-
- @Test
- public void testIsChecked_defaultIsLegacy_shouldReturnFalse() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_3BUTTON);
- assertThat(mController.isChecked()).isFalse();
- }
-
- @Test
- public void testIsChecked_defaultIsEdgeToEdge_shouldReturnFalse() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_GESTURAL);
- assertThat(mController.isChecked()).isFalse();
- }
-
- @Test
- public void testIsChecked_radioButtonClicked_shouldReturnTrue() {
- SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
- NAV_BAR_MODE_2BUTTON);
- // Set the setting to be enabled.
- mController.onRadioButtonClicked(null);
- assertThat(mController.isChecked()).isTrue();
- }
-
- @Test
- public void testOnRadioButtonClicked_setsCorrectRadioButtonChecked() {
- RadioButtonPreference radioLegacy = mock(RadioButtonPreference.class);
- RadioButtonPreference radioSwipeUp = mock(RadioButtonPreference.class);
- RadioButtonPreference radioEdgeToEdge = mock(RadioButtonPreference.class);
- PreferenceScreen screen = mock(PreferenceScreen.class);
-
- when(screen.findPreference(PREF_KEY_LEGACY)).thenReturn(radioLegacy);
- when(screen.findPreference(PREF_KEY_SWIPE_UP)).thenReturn(radioSwipeUp);
- when(screen.findPreference(PREF_KEY_EDGE_TO_EDGE)).thenReturn(radioEdgeToEdge);
-
- mController.displayPreference(screen);
- mController.onRadioButtonClicked(radioSwipeUp);
-
- verify(radioLegacy, times(1)).setChecked(false);
- verify(radioSwipeUp, times(1)).setChecked(true);
- verify(radioEdgeToEdge, times(1)).setChecked(false);
- }
-
- @Test
- public void isSliceable_returnsFalse() {
- assertThat(mController.isSliceable()).isFalse();
- }
-
- @Test
- public void isSliceableIncorrectKey_returnsFalse() {
- final SystemNavigationSwipeUpPreferenceController controller =
- new SystemNavigationSwipeUpPreferenceController(mContext, "bad_key");
- assertThat(controller.isSliceable()).isFalse();
- }
-}
