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

2
res/xml/one_handed_settings.xml
View File

@@ -41,9 +41,9 @@
settings:controller="com.android.settings.gestures.OneHandedAppTapsExitPreferenceController"/> settings:controller="com.android.settings.gestures.OneHandedAppTapsExitPreferenceController"/>
<ListPreference <ListPreference
android:key="gesture_one_handed_timeout"
android:entries="@array/one_handed_timeout_title" android:entries="@array/one_handed_timeout_title"
android:entryValues="@array/one_handed_timeout_values" android:entryValues="@array/one_handed_timeout_values"
android:key="one_handed_timeout_preference"
android:persistent="false" android:persistent="false"
android:title="@string/one_handed_timeout_title" android:title="@string/one_handed_timeout_title"
settings:controller="com.android.settings.gestures.OneHandedTimeoutPreferenceController"/> settings:controller="com.android.settings.gestures.OneHandedTimeoutPreferenceController"/>

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 public class OneHandedAppTapsExitPreferenceController extends TogglePreferenceController implements
LifecycleObserver, OnStart, OnStop, OneHandedSettingsUtils.TogglesCallback { LifecycleObserver, OnStart, OnStop, OneHandedSettingsUtils.TogglesCallback {
private Preference mPreference;
private final OneHandedSettingsUtils mUtils; private final OneHandedSettingsUtils mUtils;
private Preference mPreference;
public OneHandedAppTapsExitPreferenceController(Context context, String key) { public OneHandedAppTapsExitPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mUtils = new OneHandedSettingsUtils(context); mUtils = new OneHandedSettingsUtils(context);
// By default, app taps to stop one-handed is enabled, this will get default value once. // 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 @Override
@@ -67,12 +69,12 @@ public class OneHandedAppTapsExitPreferenceController extends TogglePreferenceCo
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
return OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, isChecked); return OneHandedSettingsUtils.setTapsAppToExitEnabled(mContext, isChecked);
} }
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return OneHandedSettingsUtils.getSettingsTapsAppToExit(mContext); return OneHandedSettingsUtils.isTapsAppToExitEnabled(mContext);
} }
@Override @Override

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

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

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

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

@@ -23,6 +23,7 @@ import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
/** /**
@@ -31,6 +32,8 @@ import android.provider.Settings;
public class OneHandedSettingsUtils { public class OneHandedSettingsUtils {
static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode"; 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 { public enum OneHandedTimeout {
NEVER(0), SHORT(4), MEDIUM(8), LONG(12); NEVER(0), SHORT(4), MEDIUM(8), LONG(12);
@@ -49,109 +52,132 @@ public class OneHandedSettingsUtils {
private final Context mContext; private final Context mContext;
private final SettingsObserver mSettingsObserver; private final SettingsObserver mSettingsObserver;
private static int sCurrentUserId;
OneHandedSettingsUtils(Context context) { OneHandedSettingsUtils(Context context) {
mContext = context; mContext = context;
sCurrentUserId = UserHandle.myUserId();
mSettingsObserver = new SettingsObserver(new Handler(Looper.getMainLooper())); mSettingsObserver = new SettingsObserver(new Handler(Looper.getMainLooper()));
} }
/** /**
* Get One-Handed mode support flag. * Gets One-Handed mode support flag.
*/ */
public static boolean isSupportOneHandedMode() { public static boolean isSupportOneHandedMode() {
return SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false); 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 * @param context App context
* @return enable or disable one-handed mode flag. * @return enable or disable one-handed mode flag.
*/ */
public static boolean isOneHandedModeEnabled(Context context) { public static boolean isOneHandedModeEnabled(Context context) {
return Settings.Secure.getInt(context.getContentResolver(), return Settings.Secure.getIntForUser(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, 0) == 1; 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 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) { public static void setOneHandedModeEnabled(Context context, boolean enable) {
Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.putIntForUser(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, enable ? 1 : 0); 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 * @param context App context
* @return enable or disable taps app to exit. * @return enable or disable taps app to exit.
*/ */
public static boolean getSettingsTapsAppToExit(Context context) { public static boolean isTapsAppToExitEnabled(Context context) {
return Settings.Secure.getInt(context.getContentResolver(), return Settings.Secure.getIntForUser(context.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, 1) == 1; 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 context App context
* @param enable enable or disable when taping app to exit one-handed mode. * @param enable enable or disable when taping app to exit one-handed mode.
*/ */
public static boolean setSettingsTapsAppToExit(Context context, boolean enable) { public static boolean setTapsAppToExitEnabled(Context context, boolean enable) {
return Settings.Secure.putInt(context.getContentResolver(), return Settings.Secure.putIntForUser(context.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, enable ? 1 : 0); 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 * @param context App context
* @return timeout value in seconds. * @return timeout value in seconds.
*/ */
public static int getSettingsOneHandedModeTimeout(Context context) { public static int getTimeoutValue(Context context) {
return Settings.Secure.getInt(context.getContentResolver(), return Settings.Secure.getIntForUser(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT, 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 context App context
* @param timeout timeout in seconds for exiting one-handed mode. * @param timeout timeout in seconds for exiting one-handed mode.
*/ */
public static void setSettingsOneHandedModeTimeout(Context context, int timeout) { public static void setTimeoutValue(Context context, int timeout) {
Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.putIntForUser(context.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT, timeout); 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 * @param context App context
* @return enable or disable Swipe-down-notification flag. * @return enable or disable Swipe-down-notification flag.
*/ */
public static boolean isSwipeDownNotificationEnabled(Context context) { public static boolean isSwipeDownNotificationEnabled(Context context) {
return Settings.Secure.getInt(context.getContentResolver(), return Settings.Secure.getIntForUser(context.getContentResolver(),
Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 0) == 1; 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 context App context
* @param enable enable or disable Swipe-down-notification. * @param enable enable or disable Swipe-down-notification.
*/ */
public static void setSwipeDownNotificationEnabled(Context context, boolean enable) { public static void setSwipeDownNotificationEnabled(Context context, boolean enable) {
Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.putIntForUser(context.getContentResolver(),
Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, enable ? 1 : 0); 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 * @param callback for state changes
*/ */
public void registerToggleAwareObserver(TogglesCallback callback) { 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() { public void unregisterToggleAwareObserver() {
final ContentResolver resolver = mContext.getContentResolver(); final ContentResolver resolver = mContext.getContentResolver();
@@ -198,7 +224,8 @@ public class OneHandedSettingsUtils {
public interface TogglesCallback { public interface TogglesCallback {
/** /**
* Callback method for Settings.Secure key state changes. * Callback method for Settings.Secure key state changes.
* @param uri *
* @param uri The Uri of the changed content.
*/ */
void onChange(Uri uri); 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 { OneHandedSettingsUtils.TogglesCallback {
private final Map<String, String> mTimeoutMap; private final Map<String, String> mTimeoutMap;
private Preference mTimeoutPreference;
private final OneHandedSettingsUtils mUtils; private final OneHandedSettingsUtils mUtils;
private Preference mTimeoutPreference;
public OneHandedTimeoutPreferenceController(Context context, String preferenceKey) { public OneHandedTimeoutPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mTimeoutMap = new HashMap<>(); mTimeoutMap = new HashMap<>();
initTimeoutMap(); initTimeoutMap();
mUtils = new OneHandedSettingsUtils(context); mUtils = new OneHandedSettingsUtils(context);
@@ -62,7 +64,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
return false; return false;
} }
final int newValue = Integer.parseInt((String) object); final int newValue = Integer.parseInt((String) object);
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, newValue); OneHandedSettingsUtils.setTimeoutValue(mContext, newValue);
updateState(preference); updateState(preference);
return true; return true;
} }
@@ -83,7 +85,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
if (OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext) == 0) { if (OneHandedSettingsUtils.getTimeoutValue(mContext) == 0) {
return mContext.getResources().getString(R.string.screensaver_settings_summary_never); return mContext.getResources().getString(R.string.screensaver_settings_summary_never);
} }
return String.format(mContext.getResources().getString( return String.format(mContext.getResources().getString(
@@ -112,7 +114,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
} }
private String getTimeoutValue() { private String getTimeoutValue() {
return String.valueOf(OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext)); return String.valueOf(OneHandedSettingsUtils.getTimeoutValue(mContext));
} }
private void initTimeoutMap() { 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 { public class SwipeBottomToNotificationPreferenceController extends TogglePreferenceController {
private static final String PREF_KEY = "gesture_swipe_bottom_to_notification";
public SwipeBottomToNotificationPreferenceController(Context context, String key) { public SwipeBottomToNotificationPreferenceController(Context context, String key) {
super(context, key); super(context, key);
} }
@@ -51,7 +49,7 @@ public class SwipeBottomToNotificationPreferenceController extends TogglePrefere
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
if (isChecked) { if (isChecked) {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
} }
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, isChecked); OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, isChecked);
return true; return true;

13
tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
View File

@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
@@ -27,24 +28,22 @@ import com.android.settings.core.BasePreferenceController;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class OneHandedEnablePreferenceControllerTest { public class OneHandedEnablePreferenceControllerTest {
private static final String KEY = "gesture_one_handed_mode_enabled"; private static final String KEY = "gesture_one_handed_mode_enabled";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext; private Context mContext;
private OneHandedEnablePreferenceController mController; private OneHandedEnablePreferenceController mController;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application;
mController = new OneHandedEnablePreferenceController(mContext, KEY); mController = new OneHandedEnablePreferenceController(mContext, KEY);
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
} }
@Test @Test
@@ -76,7 +75,7 @@ public class OneHandedEnablePreferenceControllerTest {
@Test @Test
public void getSummary_enabledOneHanded_shouldDisplayOnSummary() { public void getSummary_enabledOneHanded_shouldDisplayOnSummary() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
assertThat(mController.getSummary()) assertThat(mController.getSummary())
.isEqualTo(mContext.getText(R.string.switch_on_text)); .isEqualTo(mContext.getText(R.string.switch_on_text));
@@ -84,7 +83,7 @@ public class OneHandedEnablePreferenceControllerTest {
@Test @Test
public void getSummary_disabledOneHanded_shouldDisplayOffSummary() { public void getSummary_disabledOneHanded_shouldDisplayOffSummary() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
assertThat(mController.getSummary()) assertThat(mController.getSummary())
.isEqualTo(mContext.getText(R.string.switch_off_text)); .isEqualTo(mContext.getText(R.string.switch_off_text));

72
tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import com.android.settings.R; import com.android.settings.R;
@@ -37,88 +38,95 @@ public class OneHandedSettingsUtilsTest {
private static final int TIMEOUT_INDEX_MEDIUM = 2; private static final int TIMEOUT_INDEX_MEDIUM = 2;
private static final int TIMEOUT_INDEX_LONG = 3; private static final int TIMEOUT_INDEX_LONG = 3;
private static final int OFF = 0;
private static final int ON = 1;
private Context mContext; private Context mContext;
private String[] mConfigTimeout; private String[] mConfigTimeout;
private int mCurrentUserId;
@Before @Before
public void setUp() { public void setUp() {
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mCurrentUserId = UserHandle.myUserId();
mConfigTimeout = mContext.getResources().getStringArray(R.array.one_handed_timeout_values); mConfigTimeout = mContext.getResources().getStringArray(R.array.one_handed_timeout_values);
OneHandedSettingsUtils.setUserId(mCurrentUserId);
} }
@Test @Test
public void setSettingsOneHandedModeEnabled_setEnable_shouldReturnEnabled() { public void setOneHandedModeEnabled_setEnable_shouldReturnEnabled() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, 0)).isEqualTo(1); Settings.Secure.ONE_HANDED_MODE_ENABLED, OFF, mCurrentUserId)).isEqualTo(ON);
} }
@Test @Test
public void setSettingsOneHandedModeEnabled_setDisable_shouldReturnDisabled() { public void setOneHandedModeEnabled_setDisable_shouldReturnDisabled() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, 0)).isEqualTo(0); Settings.Secure.ONE_HANDED_MODE_ENABLED, OFF, mCurrentUserId)).isEqualTo(OFF);
} }
@Test @Test
public void setSettingsTapsAppToExitEnabled_setEnable_shouldReturnEnabled() { public void setTapsAppToExitEnabled_setEnable_shouldReturnEnabled() {
OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, true); OneHandedSettingsUtils.setTapsAppToExitEnabled(mContext, true);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, 1)).isEqualTo(1); Settings.Secure.TAPS_APP_TO_EXIT, OFF, mCurrentUserId)).isEqualTo(ON);
} }
@Test @Test
public void setSettingsTapsAppToExitEnabled_setDisable_shouldReturnDisabled() { public void setTapsAppToExitEnabled_setDisable_shouldReturnDisabled() {
OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, false); OneHandedSettingsUtils.setTapsAppToExitEnabled(mContext, false);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, 1)).isEqualTo(0); Settings.Secure.TAPS_APP_TO_EXIT, OFF, mCurrentUserId)).isEqualTo(OFF);
} }
@Test @Test
public void setSettingsTimeout_setNever_shouldReturnNeverValue() { public void setTimeout_setNever_shouldReturnNeverValue() {
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, OneHandedSettingsUtils.setTimeoutValue(mContext,
OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue()); OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue());
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT, Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue())) OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue(), mCurrentUserId))
.isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_NEVER])); .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_NEVER]));
} }
@Test @Test
public void setSettingsTimeout_setShort_shouldReturnShortValue() { public void setTimeout_setShort_shouldReturnShortValue() {
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, OneHandedSettingsUtils.setTimeoutValue(mContext,
OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue()); OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT, Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue())) OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue(), mCurrentUserId))
.isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_SHORT])); .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_SHORT]));
} }
@Test @Test
public void setSettingsTimeout_setMedium_shouldReturnMediumValue() { public void setTimeout_setMedium_shouldReturnMediumValue() {
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, OneHandedSettingsUtils.setTimeoutValue(mContext,
OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue()); OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue());
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT, Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue())) OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue(), mCurrentUserId))
.isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_MEDIUM])); .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_MEDIUM]));
} }
@Test @Test
public void setSettingsTimeout_setLong_shouldReturnLongValue() { public void setTimeout_setLong_shouldReturnLongValue() {
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, OneHandedSettingsUtils.setTimeoutValue(mContext,
OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue()); OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue());
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_TIMEOUT, Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue())) OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue(), mCurrentUserId))
.isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_LONG])); .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_LONG]));
} }
} }

16
tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.os.UserHandle;
import androidx.preference.ListPreference; import androidx.preference.ListPreference;
@@ -34,7 +35,7 @@ import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class OneHandedTimeoutPreferenceControllerTest { public class OneHandedTimeoutPreferenceControllerTest {
private static final String KEY = "one_handed_timeout_preference"; private static final String KEY = "gesture_one_handed_timeout";
private Context mContext; private Context mContext;
private OneHandedTimeoutPreferenceController mController; private OneHandedTimeoutPreferenceController mController;
@@ -46,11 +47,12 @@ public class OneHandedTimeoutPreferenceControllerTest {
mController = new OneHandedTimeoutPreferenceController(mContext, KEY); mController = new OneHandedTimeoutPreferenceController(mContext, KEY);
mPreference = new ListPreference(mContext); mPreference = new ListPreference(mContext);
mPreference.setKey(KEY); mPreference.setKey(KEY);
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
} }
@Test @Test
public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() { public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE); .isEqualTo(BasePreferenceController.AVAILABLE);
@@ -58,7 +60,7 @@ public class OneHandedTimeoutPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_disableOneHanded_shouldUnavailable() { public void getAvailabilityStatus_disableOneHanded_shouldUnavailable() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING); .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
@@ -66,7 +68,7 @@ public class OneHandedTimeoutPreferenceControllerTest {
@Test @Test
public void updateState_enableOneHanded_switchShouldEnabled() { public void updateState_enableOneHanded_switchShouldEnabled() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
mController.updateState(mPreference); mController.updateState(mPreference);
@@ -75,7 +77,7 @@ public class OneHandedTimeoutPreferenceControllerTest {
@Test @Test
public void updateState_disableOneHanded_switchShouldDisabled() { public void updateState_disableOneHanded_switchShouldDisabled() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
mController.updateState(mPreference); mController.updateState(mPreference);
@@ -87,7 +89,7 @@ public class OneHandedTimeoutPreferenceControllerTest {
final String[] timeoutTitles = mContext.getResources().getStringArray( final String[] timeoutTitles = mContext.getResources().getStringArray(
R.array.one_handed_timeout_title); R.array.one_handed_timeout_title);
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, OneHandedSettingsUtils.setTimeoutValue(mContext,
OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue()); OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue());
assertThat(mController.getSummary()).isEqualTo( assertThat(mController.getSummary()).isEqualTo(
@@ -99,7 +101,7 @@ public class OneHandedTimeoutPreferenceControllerTest {
final String[] timeoutTitles = mContext.getResources().getStringArray( final String[] timeoutTitles = mContext.getResources().getStringArray(
R.array.one_handed_timeout_title); R.array.one_handed_timeout_title);
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, OneHandedSettingsUtils.setTimeoutValue(mContext,
OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue()); OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
assertThat(mController.getSummary()).isEqualTo(String.format( assertThat(mController.getSummary()).isEqualTo(String.format(

4
tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationSettingsTest.java
View File

@@ -77,7 +77,7 @@ public class SwipeBottomToNotificationSettingsTest {
@Test @Test
public void isPageSearchEnabled_oneHandedDisabled_shouldReturnTrue() { public void isPageSearchEnabled_oneHandedDisabled_shouldReturnTrue() {
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true"); SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
final Object obj = ReflectionHelpers.callInstanceMethod( final Object obj = ReflectionHelpers.callInstanceMethod(
SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled", SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
@@ -90,7 +90,7 @@ public class SwipeBottomToNotificationSettingsTest {
@Test @Test
public void isPageSearchEnabled_oneHandedEnabled_shouldReturnFalse() { public void isPageSearchEnabled_oneHandedEnabled_shouldReturnFalse() {
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true"); SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
final Object obj = ReflectionHelpers.callInstanceMethod( final Object obj = ReflectionHelpers.callInstanceMethod(
SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled", SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",

11
tests/unit/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceControllerTest.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.os.UserHandle;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
@@ -37,7 +38,6 @@ public class OneHandedAppTapsExitPreferenceControllerTest {
private Context mContext; private Context mContext;
private SwitchPreference mSwitchPreference; private SwitchPreference mSwitchPreference;
private OneHandedAppTapsExitPreferenceController mController; private OneHandedAppTapsExitPreferenceController mController;
@Before @Before
@@ -46,6 +46,7 @@ public class OneHandedAppTapsExitPreferenceControllerTest {
mController = new OneHandedAppTapsExitPreferenceController(mContext, KEY); mController = new OneHandedAppTapsExitPreferenceController(mContext, KEY);
mSwitchPreference = new SwitchPreference(mContext); mSwitchPreference = new SwitchPreference(mContext);
mSwitchPreference.setKey(KEY); mSwitchPreference.setKey(KEY);
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
} }
@Test @Test
@@ -59,7 +60,7 @@ public class OneHandedAppTapsExitPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() { public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(TogglePreferenceController.AVAILABLE); .isEqualTo(TogglePreferenceController.AVAILABLE);
@@ -67,7 +68,7 @@ public class OneHandedAppTapsExitPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_disabledOneHanded_shouldUnavailable() { public void getAvailabilityStatus_disabledOneHanded_shouldUnavailable() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(TogglePreferenceController.DISABLED_DEPENDENT_SETTING); .isEqualTo(TogglePreferenceController.DISABLED_DEPENDENT_SETTING);
@@ -75,7 +76,7 @@ public class OneHandedAppTapsExitPreferenceControllerTest {
@Test @Test
public void updateState_enableOneHanded_switchShouldEnabled() { public void updateState_enableOneHanded_switchShouldEnabled() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
mController.updateState(mSwitchPreference); mController.updateState(mSwitchPreference);
@@ -84,7 +85,7 @@ public class OneHandedAppTapsExitPreferenceControllerTest {
@Test @Test
public void updateState_disableOneHanded_switchShouldDisabled() { public void updateState_disableOneHanded_switchShouldDisabled() {
OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false); OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
mController.updateState(mSwitchPreference); mController.updateState(mSwitchPreference);