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

2/ Make One handed mode support multiple user switch

Browse Source 
Previously OHM did not support for multile user switch.
We get current user id in settings and get/put settings value
with currentUserId.

Test: manual switch user and check Settings > System > Gesture > One-Handed
Test: make RunSettingsRoboTests -j40

Bug: 182278800
Change-Id: I12dcc7b634ae19375358733357dc95197e81067c
This commit is contained in:
Bill Lin
2021-03-12 18:27:10 +08:00
parent 3525843554
commit 49ba85dc8a
12 changed files with 148 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceController.java
View File

@@ -33,15 +33,17 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
public class OneHandedAppTapsExitPreferenceController extends TogglePreferenceController implements
LifecycleObserver, OnStart, OnStop, OneHandedSettingsUtils.TogglesCallback {
private Preference mPreference;
private final OneHandedSettingsUtils mUtils;
private Preference mPreference;
public OneHandedAppTapsExitPreferenceController(Context context, String key) {
super(context, key);
mUtils = new OneHandedSettingsUtils(context);
// By default, app taps to stop one-handed is enabled, this will get default value once.
OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, isChecked());
OneHandedSettingsUtils.setTapsAppToExitEnabled(mContext, isChecked());
}
@Override
@@ -67,12 +69,12 @@ public class OneHandedAppTapsExitPreferenceController extends TogglePreferenceCo
@Override
public boolean setChecked(boolean isChecked) {
return OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, isChecked);
return OneHandedSettingsUtils.setTapsAppToExitEnabled(mContext, isChecked);
}
@Override
public boolean isChecked() {
return OneHandedSettingsUtils.getSettingsTapsAppToExit(mContext);
return OneHandedSettingsUtils.isTapsAppToExitEnabled(mContext);
}
@Override

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

@@ -40,8 +40,7 @@ public class OneHandedEnablePreferenceController extends TogglePreferenceControl
@Override
public boolean setChecked(boolean isChecked) {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext,
isChecked);
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, isChecked);
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, !isChecked);
return true;
}
@@ -53,8 +52,7 @@ public class OneHandedEnablePreferenceController extends TogglePreferenceControl
@Override
public CharSequence getSummary() {
return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
? mContext.getText(R.string.switch_on_text)
: mContext.getText(R.string.switch_off_text);
return mContext.getText(
isChecked() ? R.string.gesture_setting_on : R.string.gesture_setting_off);
}
}

7
src/com/android/settings/gestures/OneHandedSettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -42,6 +43,12 @@ public class OneHandedSettings extends DashboardFragment {
return TAG;
}
@Override
protected void updatePreferenceStates() {
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
super.updatePreferenceStates();
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.one_handed_settings;

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

@@ -23,6 +23,7 @@ import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
/**
@@ -31,6 +32,8 @@ import android.provider.Settings;
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;
public enum OneHandedTimeout {
NEVER(0), SHORT(4), MEDIUM(8), LONG(12);
@@ -49,109 +52,132 @@ public class OneHandedSettingsUtils {
private final Context mContext;
private final SettingsObserver mSettingsObserver;
private static int sCurrentUserId;
OneHandedSettingsUtils(Context context) {
mContext = context;
sCurrentUserId = UserHandle.myUserId();
mSettingsObserver = new SettingsObserver(new Handler(Looper.getMainLooper()));
}
/**
* Get One-Handed mode support flag.
* Gets One-Handed mode support flag.
*/
public static boolean isSupportOneHandedMode() {
return SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);
}
/**
* Get one-handed mode enable or disable flag from Settings provider.
* Gets one-handed mode feature enable or disable flag from Settings provider.
*
* @param context App context
* @return enable or disable one-handed mode flag.
*/
public static boolean isOneHandedModeEnabled(Context context) {
return Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, 0) == 1;
return Settings.Secure.getIntForUser(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, OFF, sCurrentUserId) == ON;
}
/**
* Set one-handed mode enable or disable flag to Settings provider.
* Sets one-handed mode enable or disable flag to Settings provider.
*
* @param context App context
* @param enable enable or disable one-handed mode.
* @param enable enable or disable one-handed mode.
*/
public static void setSettingsOneHandedModeEnabled(Context context, boolean enable) {
Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, enable ? 1 : 0);
public static void setOneHandedModeEnabled(Context context, boolean enable) {
Settings.Secure.putIntForUser(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, enable ? ON : OFF, sCurrentUserId);
}
/**
* Get enabling taps app to exit one-handed mode flag from Settings provider.
* Gets enabling taps app to exit one-handed mode flag from Settings provider.
*
* @param context App context
* @return enable or disable taps app to exit.
*/
public static boolean getSettingsTapsAppToExit(Context context) {
return Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, 1) == 1;
public static boolean isTapsAppToExitEnabled(Context context) {
return Settings.Secure.getIntForUser(context.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, OFF, sCurrentUserId) == ON;
}
/**
* Set enabling taps app to exit one-handed mode flag to Settings provider.
* Sets enabling taps app to exit one-handed mode flag to Settings provider.
*
* @param context App context
* @param enable enable or disable when taping app to exit one-handed mode.
*/
public static boolean setSettingsTapsAppToExit(Context context, boolean enable) {
return Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, enable ? 1 : 0);
public static boolean setTapsAppToExitEnabled(Context context, boolean enable) {
return Settings.Secure.putIntForUser(context.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, enable ? ON : OFF, sCurrentUserId);
}
/**
* Get one-handed mode timeout value from Settings provider.
* Gets one-handed mode timeout value from Settings provider.
*
* @param context App context
* @return timeout value in seconds.
*/
public static int getSettingsOneHandedModeTimeout(Context context) {
return Settings.Secure.getInt(context.getContentResolver(),
public static int getTimeoutValue(Context context) {
return Settings.Secure.getIntForUser(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
OneHandedTimeout.MEDIUM.getValue() /* default MEDIUM(8) by UX */);
OneHandedTimeout.MEDIUM.getValue() /* default MEDIUM(8) by UX */,
sCurrentUserId);
}
/**
* Set one-handed mode timeout value to Settings provider.
* Gets current user id from OneHandedSettingsUtils
*
* @return the current user id in OneHandedSettingsUtils
*/
public static int getUserId() {
return sCurrentUserId;
}
/**
* Sets specific user id for OneHandedSettingsUtils
*
* @param userId the user id to be updated
*/
public static void setUserId(int userId) {
sCurrentUserId = userId;
}
/**
* Sets one-handed mode timeout value to Settings provider.
*
* @param context App context
* @param timeout timeout in seconds for exiting one-handed mode.
*/
public static void setSettingsOneHandedModeTimeout(Context context, int timeout) {
Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT, timeout);
public static void setTimeoutValue(Context context, int timeout) {
Settings.Secure.putIntForUser(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT, timeout, sCurrentUserId);
}
/**
* Get Swipe-down-notification enable or disable flag from Settings provider.
* Gets Swipe-down-notification enable or disable flag from Settings provider.
*
* @param context App context
* @return enable or disable Swipe-down-notification flag.
*/
public static boolean isSwipeDownNotificationEnabled(Context context) {
return Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 0) == 1;
return Settings.Secure.getIntForUser(context.getContentResolver(),
Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, OFF, sCurrentUserId) == ON;
}
/**
* Set Swipe-down-notification enable or disable flag to Settings provider.
* Sets Swipe-down-notification enable or disable flag to Settings provider.
*
* @param context App context
* @param enable enable or disable Swipe-down-notification.
*/
public static void setSwipeDownNotificationEnabled(Context context, boolean enable) {
Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, enable ? 1 : 0);
Settings.Secure.putIntForUser(context.getContentResolver(),
Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, enable ? ON : OFF,
sCurrentUserId);
}
/**
* Register callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
* Registers callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
* @param callback for state changes
*/
public void registerToggleAwareObserver(TogglesCallback callback) {
@@ -160,7 +186,7 @@ public class OneHandedSettingsUtils {
}
/**
* Unregister callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
* Unregisters callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
*/
public void unregisterToggleAwareObserver() {
final ContentResolver resolver = mContext.getContentResolver();
@@ -198,7 +224,8 @@ public class OneHandedSettingsUtils {
public interface TogglesCallback {
/**
* Callback method for Settings.Secure key state changes.
* @param uri
*
* @param uri The Uri of the changed content.
*/
void onChange(Uri uri);
}

10
src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
View File

@@ -40,11 +40,13 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
OneHandedSettingsUtils.TogglesCallback {
private final Map<String, String> mTimeoutMap;
private Preference mTimeoutPreference;
private final OneHandedSettingsUtils mUtils;
private Preference mTimeoutPreference;
public OneHandedTimeoutPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mTimeoutMap = new HashMap<>();
initTimeoutMap();
mUtils = new OneHandedSettingsUtils(context);
@@ -62,7 +64,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
return false;
}
final int newValue = Integer.parseInt((String) object);
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, newValue);
OneHandedSettingsUtils.setTimeoutValue(mContext, newValue);
updateState(preference);
return true;
}
@@ -83,7 +85,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
@Override
public CharSequence getSummary() {
if (OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext) == 0) {
if (OneHandedSettingsUtils.getTimeoutValue(mContext) == 0) {
return mContext.getResources().getString(R.string.screensaver_settings_summary_never);
}
return String.format(mContext.getResources().getString(
@@ -112,7 +114,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
}
private String getTimeoutValue() {
return String.valueOf(OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext));
return String.valueOf(OneHandedSettingsUtils.getTimeoutValue(mContext));
}
private void initTimeoutMap() {

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

@@ -27,8 +27,6 @@ import com.android.settings.core.TogglePreferenceController;
**/
public class SwipeBottomToNotificationPreferenceController extends TogglePreferenceController {
private static final String PREF_KEY = "gesture_swipe_bottom_to_notification";
public SwipeBottomToNotificationPreferenceController(Context context, String key) {
super(context, key);
}
@@ -51,7 +49,7 @@ public class SwipeBottomToNotificationPreferenceController extends TogglePrefere
@Override
public boolean setChecked(boolean isChecked) {
if (isChecked) {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
}
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, isChecked);
return true;