Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 397f06ab authored by tom hsu's avatar tom hsu
Browse files

Add Regional preference UI for Physical keyboard location. 

Bug: b/271805730
Test: Maunal test.
Test: atest passed.
Change-Id: Iab4351c158d6cf24d1a5aa1307ef0182eec522ae
parent db7e7d09

res/xml/language_settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -37,5 +37,13 @@ 
                android:name="classname"

                android:value="com.android.settings.applications.appinfo.AppLocaleDetails" />

        </Preference>



        <Preference

            android:key="regional_preferences"

            android:title="@string/regional_preferences_title"

            android:summary="@string/regional_preferences_summary"

            android:fragment="com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment"

            settings:controller="com.android.settings.regionalpreferences.RegionalPreferencesController" />



    </PreferenceCategory>

</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/language/LanguagePreferenceController.java

+31 −0
Original line number Diff line number Diff line
@@ -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

tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/*

 * 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;

    }

}