PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change One-handed mode controls states in the Settings pages for

Browse Source 
improving better UX experience

According to UX feedback to adjust One-handed mode UI
controls’ status in the Settings page for better UX experience.

Bug: 192171369

Test: manual verified on Settings > System > Gesture page
> System controls page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionShowNotificationPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedPreferenceCategoryControllerTest"

Change-Id: I76242fe70c3ec06cd5e2f9bb059c87293cc686dd
This commit is contained in:
Jason Chang
2021-06-27 20:49:02 +08:00
parent b4f59a75d5
commit d9a4197d9d
11 changed files with 217 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java
View File

@@ -92,7 +92,8 @@ public class OneHandedActionPullDownPrefController extends BasePreferenceControl
if (mPreference == null) {
return;
}
if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)) {
if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)
|| uri.equals(OneHandedSettingsUtils.SHORTCUT_ENABLED_URI)) {
mPreference.setEnabled(OneHandedSettingsUtils.canEnableController(mContext));
} else if (uri.equals(OneHandedSettingsUtils.SHOW_NOTIFICATION_ENABLED_URI)) {
updateState(mPreference);

3
src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java
View File

@@ -92,7 +92,8 @@ public class OneHandedActionShowNotificationPrefController extends BasePreferenc
if (mPreference == null) {
return;
}
if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)) {
if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)
|| uri.equals(OneHandedSettingsUtils.SHORTCUT_ENABLED_URI)) {
mPreference.setEnabled(OneHandedSettingsUtils.canEnableController(mContext));
} else if (uri.equals(OneHandedSettingsUtils.SHOW_NOTIFICATION_ENABLED_URI)) {
updateState(mPreference);

4
src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.gestures;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -27,8 +26,6 @@ import com.android.settings.core.BasePreferenceController;
*/
public class OneHandedEnablePreferenceController extends BasePreferenceController {
private static final String ONE_HANDED_ENABLED = Settings.Secure.ONE_HANDED_MODE_ENABLED;
public OneHandedEnablePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@@ -44,5 +41,4 @@ public class OneHandedEnablePreferenceController extends BasePreferenceControlle
OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
? R.string.gesture_setting_on : R.string.gesture_setting_off);
}
}

52
src/com/android/settings/gestures/OneHandedPreferenceCategoryController.java Normal file
View File

@@ -0,0 +1,52 @@
/*
* 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 androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
* Category Preference controller for One-handed mode category
*/
public class OneHandedPreferenceCategoryController extends BasePreferenceController {
private Preference mPreference;
public OneHandedPreferenceCategoryController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
mPreference.setTitle(
OneHandedSettingsUtils.getNavigationBarMode(mContext) == 0 /* 3 button */
? R.string.one_handed_mode_use_shortcut_category
: R.string.one_handed_mode_swipe_down_category);
}
}

34
src/com/android/settings/gestures/OneHandedSettingsUtils.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.gestures;
import static com.android.internal.accessibility.AccessibilityShortcutController.ONE_HANDED_COMPONENT_NAME;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
@@ -33,6 +35,9 @@ import androidx.annotation.VisibleForTesting;
*/
public class OneHandedSettingsUtils {
static final String ONE_HANDED_MODE_TARGET_NAME =
ONE_HANDED_COMPONENT_NAME.getShortClassName();
static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode";
static final int OFF = 0;
static final int ON = 1;
@@ -40,6 +45,8 @@ public class OneHandedSettingsUtils {
Settings.Secure.getUriFor(Settings.Secure.ONE_HANDED_MODE_ENABLED);
static final Uri SHOW_NOTIFICATION_ENABLED_URI =
Settings.Secure.getUriFor(Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED);
static final Uri SHORTCUT_ENABLED_URI =
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);
public enum OneHandedTimeout {
NEVER(0), SHORT(4), MEDIUM(8), LONG(12);
@@ -220,8 +227,30 @@ public class OneHandedSettingsUtils {
* navigation settings.
*/
public static boolean canEnableController(Context context) {
return (OneHandedSettingsUtils.isOneHandedModeEnabled(context)
&& OneHandedSettingsUtils.getNavigationBarMode(context) != 0 /* 3-button mode */);
return ((OneHandedSettingsUtils.isOneHandedModeEnabled(context)
&& getNavigationBarMode(context) != 0 /* 3-button */)
|| getShortcutEnabled(context));
}
/**
* Queries one-handed mode shortcut enabled in settings or not.
*
* @return true if user enabled one-handed shortcut in settings, false otherwise.
*/
public static boolean getShortcutEnabled(Context context) {
final String targets = Settings.Secure.getStringForUser(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, sCurrentUserId);
return targets != null ? targets.contains(ONE_HANDED_MODE_TARGET_NAME) : false;
}
/**
* This is a test only API for set Shortcut enabled or not.
*/
@VisibleForTesting
public void setShortcutEnabled(Context context, boolean enabled) {
final String targetName = enabled ? ONE_HANDED_MODE_TARGET_NAME : "";
Settings.Secure.putStringForUser(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, targetName, sCurrentUserId);
}
/**
@@ -256,6 +285,7 @@ public class OneHandedSettingsUtils {
final ContentResolver resolver = mContext.getContentResolver();
resolver.registerContentObserver(ONE_HANDED_MODE_ENABLED_URI, true, this);
resolver.registerContentObserver(SHOW_NOTIFICATION_ENABLED_URI, true, this);
resolver.registerContentObserver(SHORTCUT_ENABLED_URI, true, this);
}
@Override