Update key visual changes for one handed mode settings
Follow new visual UI to change the design.
Bug: 175851783
Bug: 188868459
Bug: 189001678
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"
Change-Id: I86535fd9f49726c7234353032b950640346a02c5
This commit is contained in:
@@ -26,6 +26,8 @@ import android.os.SystemProperties;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
/**
|
||||
* The Util to query one-handed mode settings config
|
||||
*/
|
||||
@@ -34,6 +36,10 @@ public class OneHandedSettingsUtils {
|
||||
static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode";
|
||||
static final int OFF = 0;
|
||||
static final int ON = 1;
|
||||
static final Uri ONE_HANDED_MODE_ENABLED_URI =
|
||||
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);
|
||||
|
||||
public enum OneHandedTimeout {
|
||||
NEVER(0), SHORT(4), MEDIUM(8), LONG(12);
|
||||
@@ -176,6 +182,21 @@ public class OneHandedSettingsUtils {
|
||||
sCurrentUserId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set NavigationBar mode flag to Settings provider.
|
||||
* @param context App context
|
||||
* @param value Navigation bar mode:
|
||||
* 0 = 3 button
|
||||
* 1 = 2 button
|
||||
* 2 = fully gestural
|
||||
* @return true if the value was set, false on database errors.
|
||||
*/
|
||||
@VisibleForTesting
|
||||
public boolean setNavigationBarMode(Context context, String value) {
|
||||
return Settings.Secure.putStringForUser(context.getContentResolver(),
|
||||
Settings.Secure.NAVIGATION_MODE, value, UserHandle.myUserId());
|
||||
}
|
||||
|
||||
/**
|
||||
* Get NavigationBar mode flag from Settings provider.
|
||||
* @param context App context
|
||||
@@ -189,6 +210,20 @@ public class OneHandedSettingsUtils {
|
||||
Settings.Secure.NAVIGATION_MODE, 2 /* fully gestural */, sCurrentUserId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if One-handed mode settings controllers can enabled or disabled.
|
||||
* @param context App context
|
||||
* @return true if controllers are able to enabled, false otherwise.
|
||||
*
|
||||
* Note: For better UX experience, just disabled controls that let users know to use
|
||||
* this feature, they need to make sure gesture navigation is turned on in system
|
||||
* navigation settings.
|
||||
*/
|
||||
public static boolean canEnableController(Context context) {
|
||||
return (OneHandedSettingsUtils.isOneHandedModeEnabled(context)
|
||||
&& OneHandedSettingsUtils.getNavigationBarMode(context) != 0 /* 3-button mode */);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
|
||||
* @param callback for state changes
|
||||
@@ -209,9 +244,6 @@ public class OneHandedSettingsUtils {
|
||||
private final class SettingsObserver extends ContentObserver {
|
||||
private TogglesCallback mCallback;
|
||||
|
||||
private final Uri mOneHandedEnabledAware = Settings.Secure.getUriFor(
|
||||
Settings.Secure.ONE_HANDED_MODE_ENABLED);
|
||||
|
||||
SettingsObserver(Handler handler) {
|
||||
super(handler);
|
||||
}
|
||||
@@ -222,7 +254,8 @@ public class OneHandedSettingsUtils {
|
||||
|
||||
public void observe() {
|
||||
final ContentResolver resolver = mContext.getContentResolver();
|
||||
resolver.registerContentObserver(mOneHandedEnabledAware, true, this);
|
||||
resolver.registerContentObserver(ONE_HANDED_MODE_ENABLED_URI, true, this);
|
||||
resolver.registerContentObserver(SHOW_NOTIFICATION_ENABLED_URI, true, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user