summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeffreyhuang <jeffreyhuang@google.com>2017-09-27 15:33:41 -0700
committerjeffreyhuang <jeffreyhuang@google.com>2017-09-29 09:53:07 -0700
commit30c143b1e43d51832a5f04e1fe5742f8000386d7 (patch)
tree9b048e337b73ec0c49540c975edecec46d92e859
parentae6c29d10f516b2f9fe9801190bdf09d3424618e (diff)
downloadpackages_apps_Settings-30c143b1e43d51832a5f04e1fe5742f8000386d7.tar.gz
packages_apps_Settings-30c143b1e43d51832a5f04e1fe5742f8000386d7.tar.bz2
packages_apps_Settings-30c143b1e43d51832a5f04e1fe5742f8000386d7.zip
Introduce RtlLayoutPreferenceController
- Create new RtlLayoutPreferenceController - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ieefd8dc97b0e1f781d97aca781bba0243c3875b9
-rw-r--r--src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java2
-rw-r--r--src/com/android/settings/development/RtlLayoutPreferenceController.java98
-rw-r--r--tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java128
3 files changed, 227 insertions, 1 deletions
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index a4e5de1cfe..352329ce81 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -281,7 +281,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new PointerLocationPreferenceController(context));
controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
// show layout bounds
- // force rtl layout direction
+ controllers.add(new RtlLayoutPreferenceController(context));
// window animation scale
// transition animation scale
// animator duration scale
diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java
new file mode 100644
index 0000000000..364ee9dfdc
--- /dev/null
+++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2017 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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.app.LocalePicker;
+
+public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceController implements
+ Preference.OnPreferenceChangeListener {
+
+ private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
+
+ @VisibleForTesting
+ static final int SETTING_VALUE_ON = 1;
+ @VisibleForTesting
+ static final int SETTING_VALUE_OFF = 0;
+
+ private SwitchPreference mPreference;
+
+ public RtlLayoutPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return FORCE_RTL_LAYOUT_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean isEnabled = (Boolean) newValue;
+ writeToForceRtlLayoutSetting(isEnabled);
+ updateLocales();
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.DEVELOPMENT_FORCE_RTL, SETTING_VALUE_OFF);
+ mPreference.setChecked(rtlLayoutMode != SETTING_VALUE_OFF);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ writeToForceRtlLayoutSetting(false);
+ updateLocales();
+ mPreference.setChecked(false);
+ mPreference.setEnabled(false);
+ }
+
+ @VisibleForTesting
+ void updateLocales() {
+ LocalePicker.updateLocales(mContext.getResources().getConfiguration().getLocales());
+ }
+
+ private void writeToForceRtlLayoutSetting(boolean isEnabled) {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.DEVELOPMENT_FORCE_RTL,
+ isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+ SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL,
+ isEnabled ? Integer.toString(SETTING_VALUE_ON)
+ : Integer.toString(SETTING_VALUE_OFF));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
new file mode 100644
index 0000000000..808e2a7a03
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class RtlLayoutPreferenceControllerTest {
+
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private SwitchPreference mPreference;
+
+ private Context mContext;
+
+ private RtlLayoutPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new RtlLayoutPreferenceController(mContext);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ mController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void updateState_forceRtlEnabled_shouldCheckedPreference() {
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL,
+ RtlLayoutPreferenceController.SETTING_VALUE_ON);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void updateState_forceRtlDisabled_shouldUncheckedPreference() {
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL,
+ RtlLayoutPreferenceController.SETTING_VALUE_OFF);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onPreferenceChange_preferenceChecked_shouldEnableForceRtl() {
+ mController = spy(mController);
+ doNothing().when(mController).updateLocales();
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ final int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.DEVELOPMENT_FORCE_RTL, -1 /* default */);
+
+ assertThat(rtlLayoutMode).isEqualTo(RtlLayoutPreferenceController.SETTING_VALUE_ON);
+ }
+
+ @Test
+ public void onPreferenceChange__preferenceUnchecked_shouldDisableForceRtl() {
+ mController = spy(mController);
+ doNothing().when(mController).updateLocales();
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ final int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.DEVELOPMENT_FORCE_RTL, -1 /* default */);
+
+ assertThat(rtlLayoutMode).isEqualTo(RtlLayoutPreferenceController.SETTING_VALUE_OFF);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ verify(mPreference).setEnabled(true);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
+ mController = spy(mController);
+ doNothing().when(mController).updateLocales();
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ final int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.DEVELOPMENT_FORCE_RTL, -1 /* default */);
+
+ assertThat(rtlLayoutMode).isEqualTo(RtlLayoutPreferenceController.SETTING_VALUE_OFF);
+ verify(mPreference).setEnabled(false);
+ verify(mPreference).setChecked(false);
+ }
+}