From 397f06abffd55b227ed3a77f4145b1f08d39438b Mon Sep 17 00:00:00 2001 From: tom hsu Date: Thu, 9 Mar 2023 11:55:52 +0800 Subject: [PATCH] Add Regional preference UI for Physical keyboard location. Bug: b/271805730 Test: Maunal test. Test: atest passed. Change-Id: Iab4351c158d6cf24d1a5aa1307ef0182eec522ae --- res/xml/language_settings.xml | 8 ++ .../LanguagePreferenceController.java | 31 ++++++ .../LanguagePreferenceControllerTest.java | 97 +++++++++++++++++++ 3 files changed, 136 insertions(+) create mode 100644 tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml index 69fa4d2733d..ff41a0b602f 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -37,5 +37,13 @@ android:name="classname" android:value="com.android.settings.applications.appinfo.AppLocaleDetails" /> + + + \ No newline at end of file diff --git a/src/com/android/settings/language/LanguagePreferenceController.java b/src/com/android/settings/language/LanguagePreferenceController.java index 08033cd0863..cbccb0004bd 100644 --- a/src/com/android/settings/language/LanguagePreferenceController.java +++ b/src/com/android/settings/language/LanguagePreferenceController.java @@ -16,12 +16,22 @@ package com.android.settings.language; +import android.content.ComponentName; import android.content.Context; +import android.content.pm.PackageManager; import android.util.FeatureFlagUtils; +import com.android.settings.Settings; import com.android.settings.core.BasePreferenceController; +/** + * This is a display controller for new language activity entry. + * TODO(b/273642892): When new layout is on board, this class shall be removed. + */ public class LanguagePreferenceController extends BasePreferenceController { + private static final String TAG = LanguagePreferenceController.class.getSimpleName(); + + private boolean mCacheIsFeatureOn = false; public LanguagePreferenceController(Context context, String key) { super(context, key); @@ -31,6 +41,27 @@ public class LanguagePreferenceController extends BasePreferenceController { public int getAvailabilityStatus() { boolean isFeatureOn = FeatureFlagUtils .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI); + + // LanguageSettingsActivity is a new entry page for new language layout. + // LanguageAndInputSettingsActivity is existed entry page for current language layout. + if (mCacheIsFeatureOn != isFeatureOn) { + setActivityEnabled( + mContext, Settings.LanguageAndInputSettingsActivity.class, !isFeatureOn); + setActivityEnabled(mContext, Settings.LanguageSettingsActivity.class, isFeatureOn); + mCacheIsFeatureOn = isFeatureOn; + } return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } + + private static void setActivityEnabled(Context context, Class klass, final boolean isEnabled) { + PackageManager packageManager = context.getPackageManager(); + + ComponentName componentName = + new ComponentName(context, klass); + final int flag = isEnabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : + PackageManager.COMPONENT_ENABLED_STATE_DISABLED; + + packageManager.setComponentEnabledSetting( + componentName, flag, PackageManager.DONT_KILL_APP); + } } \ No newline at end of file diff --git a/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java new file mode 100644 index 00000000000..6622753e1d7 --- /dev/null +++ b/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2023 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.language; + +import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import android.content.ComponentName; +import android.content.Context; +import android.content.pm.PackageManager; +import android.util.FeatureFlagUtils; + +import androidx.test.core.app.ApplicationProvider; + +import com.android.settings.Settings; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class LanguagePreferenceControllerTest { + private boolean mCacheFeatureFlagSwitch = false; + private Context mContext; + private LanguagePreferenceController mController; + + @Before + public void setup() { + mContext = ApplicationProvider.getApplicationContext(); + mCacheFeatureFlagSwitch = + FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI); + mController = new LanguagePreferenceController(mContext, "key"); + + } + + @After + public void tearDown() { + FeatureFlagUtils.setEnabled( + mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI, mCacheFeatureFlagSwitch); + } + + @Test + public void getAvailabilityStatus_featureFlagOff_returnUnavailable() { + FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI, + false); + + int result = mController.getAvailabilityStatus(); + + assertEquals(CONDITIONALLY_UNAVAILABLE, result); + } + + @Test + public void getAvailabilityStatus_featureFlagOff_LanguageAndInputSettingsActivityEnabled() { + FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI, + false); + + mController.getAvailabilityStatus(); + + assertTrue(isActivityEnable(mContext, Settings.LanguageAndInputSettingsActivity.class)); + assertFalse(isActivityEnable(mContext, Settings.LanguageSettingsActivity.class)); + } + + @Test + public void getAvailabilityStatus_featureFlagOff_LanguageAndInputSettingsActivitydisabled() { + FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI, + true); + + mController.getAvailabilityStatus(); + + assertFalse(isActivityEnable(mContext, Settings.LanguageAndInputSettingsActivity.class)); + assertTrue(isActivityEnable(mContext, Settings.LanguageSettingsActivity.class)); + } + + private static boolean isActivityEnable(Context context, Class klazz) { + PackageManager packageManager = context.getPackageManager(); + ComponentName componentName = + new ComponentName(context, klazz); + int flag = packageManager.getComponentEnabledSetting(componentName); + return flag == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + } +}