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

Commit db433803 authored by tomhsu's avatar tomhsu Committed by Tom Hsu
Browse files

Make UI and wording dynamically show on 

 - Satellite preferences may show on by deifferent reason. To fullfill
   these conditions, let category be able to dynamically show on base on
   the preference exist or not.
 - Show string of Connectivity or Messaging for service state change.

Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Fix: b/378408939
Test: atest pass
Test: make pass
Change-Id: Ibb0f9089805bb35d0334603e55d292c9883262ff
parent 9b65eafc

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -12298,8 +12298,10 @@ 
    <string name="satellite_warning_dialog_title">Can’t turn on <xliff:g id="function" example="bluetooth">%1$s</xliff:g></string>

    <!-- Content for satellite warning dialog to avoid user using wifi/bluetooth/airplane mode [CHAR_LIMIT=NONE] -->

    <string name="satellite_warning_dialog_content">To turn on <xliff:g id="function" example="bluetooth">%1$s</xliff:g>, first end the satellite connection</string>

    <!-- Category title for satellite functions in mobile network settings [CHAR LIMIT=60] -->

    <!-- Category title for satellite functions with data transmission in mobile network settings [CHAR LIMIT=60] -->

    <string name="category_title_satellite_connectivity">Satellite connectivity</string>

    <!-- Title for satellite functions with data transmission in mobile network settings [CHAR LIMIT=60] -->

    <string name="satellite_setting_connectivity">Satellite connectivity</string>

















    <!-- Title for Apn settings in mobile network settings [CHAR LIMIT=60] -->

























res/xml/mobile_network_settings.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -206,7 +206,7 @@

















        <PreferenceCategory









            android:key="telephony_satellite_settings_category_key"









            android:title="@string/category_title_satellite_connectivity"









            android:title="@string/satellite_setting_title"









            settings:controller="com.android.settings.network.telephony.SatelliteSettingsPreferenceCategoryController">



















            <com.android.settingslib.RestrictedPreference
































src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -86,6 +86,7 @@ public class SatelliteSettingPreferenceController extends







    @Override









    public void displayPreference(@NonNull PreferenceScreen screen) {









        super.displayPreference(screen);









        updateState(screen.findPreference(getPreferenceKey()));









    }



















    @Override
































src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java



+87
−22






























Original line number
Diff line number
Diff line







@@ -16,55 +16,120 @@

















package com.android.settings.network.telephony;



















import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;









import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;



















import android.content.Context;









import android.os.PersistableBundle;









import android.telephony.CarrierConfigManager;









import android.telephony.satellite.SatelliteManager;









import android.telephony.TelephonyCallback;









import android.telephony.TelephonyManager;









import android.telephony.satellite.NtnSignalStrength;









import android.util.Log;



















import com.android.internal.telephony.flags.Flags;









import com.android.settings.network.CarrierConfigCache;









import androidx.annotation.NonNull;









import androidx.annotation.VisibleForTesting;









import androidx.lifecycle.DefaultLifecycleObserver;









import androidx.lifecycle.LifecycleOwner;









import androidx.preference.PreferenceCategory;









import androidx.preference.PreferenceScreen;



















import com.android.settings.R;



















import java.util.List;



















/** Preference controller for Satellite functions in mobile network settings. */









public class SatelliteSettingsPreferenceCategoryController









        extends TelephonyBasePreferenceController {









        extends TelephonyBasePreferenceController implements DefaultLifecycleObserver {









    private static final String TAG = "SatelliteSettingsPrefCategoryCon";



















    private CarrierConfigCache mCarrierConfigCache;









    private SatelliteManager mSatelliteManager;









    private PreferenceCategory mPreferenceCategory;









    private TelephonyManager mTelephonyManager = null;



















    @VisibleForTesting









    final CarrierRoamingNtnModeCallback mCarrierRoamingNtnModeCallback =









            new CarrierRoamingNtnModeCallback();



















    public SatelliteSettingsPreferenceCategoryController(Context context, String key) {









        super(context, key);









        mCarrierConfigCache = CarrierConfigCache.getInstance(context);









        mSatelliteManager = context.getSystemService(SatelliteManager.class);









        setAvailabilityStatus(UNSUPPORTED_ON_DEVICE);









        mTelephonyManager = context.getSystemService(TelephonyManager.class);









    }



















    /**









     * Set subId for Satellite Settings category .









     *









     * @param subId subscription ID.









     */









    public void init(int subId) {









        Log.d(TAG, "init(), subId=" + subId);









        mSubId = subId;









        mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);









    }



















    @Override









    public void displayPreference(PreferenceScreen screen) {









        super.displayPreference(screen);









        mPreferenceCategory = screen.findPreference(getPreferenceKey());









        if (mPreferenceCategory.getPreferenceCount() > 0) {









            for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i++) {









                if (mPreferenceCategory.getPreference(i).isVisible()) {









                    setAvailabilityStatus(AVAILABLE_UNSEARCHABLE);









                    break;









                }









            }









        }









    }



















    @Override









    public int getAvailabilityStatus(int subId) {









        if (!Flags.carrierEnabledSatelliteFlag()) {









            Log.d(TAG, "getAvailabilityStatus(" + subId + ") : carrierEnabledSatelliteFlag "









                    + "is disabled");









            return UNSUPPORTED_ON_DEVICE;









        return isAvailable() ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;









    }



















        if (mSatelliteManager == null) {









            Log.d(TAG, "getAvailabilityStatus(" + subId + ") : SatelliteManager is null");









            return UNSUPPORTED_ON_DEVICE;









    @Override









    public void onResume(@NonNull LifecycleOwner owner) {









        mTelephonyManager.registerTelephonyCallback(mContext.getMainExecutor(),









                mCarrierRoamingNtnModeCallback);









    }



















        final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);









        final boolean isSatelliteAttachSupported = carrierConfig.getBoolean(









                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);









    @Override









    public void onPause(@NonNull LifecycleOwner owner) {









        mTelephonyManager.unregisterTelephonyCallback(mCarrierRoamingNtnModeCallback);









    }



















        return isSatelliteAttachSupported ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;









    @VisibleForTesting









    class CarrierRoamingNtnModeCallback extends TelephonyCallback implements









            TelephonyCallback.CarrierRoamingNtnModeListener {









        @Override









        public void onCarrierRoamingNtnAvailableServicesChanged(List<Integer> availableServices) {









            CarrierRoamingNtnModeListener.super.onCarrierRoamingNtnAvailableServicesChanged(









                    availableServices);









            boolean isSmsAvailable = availableServices.contains(SERVICE_TYPE_SMS);









            boolean isDataAvailable = availableServices.contains(SERVICE_TYPE_DATA);









            Log.i(TAG, "isSmsAvailable : " + isSmsAvailable









                    + " / isDataAvailable " + isDataAvailable);









            if (mPreferenceCategory == null) {









                Log.d(TAG, "Satellite preference category is not initialized yet");









                return;









            }









            if (isDataAvailable) {









                mPreferenceCategory.setTitle(R.string.category_title_satellite_connectivity);









            } else if (isSmsAvailable) {









                mPreferenceCategory.setTitle(R.string.satellite_setting_title);









            }









        }



















        @Override









        public void onCarrierRoamingNtnEligibleStateChanged(boolean eligible) {









            // Do nothing









        }



















        @Override









        public void onCarrierRoamingNtnModeChanged(boolean active) {









            // Do nothing









        }



















        @Override









        public void onCarrierRoamingNtnSignalStrengthChanged(NtnSignalStrength ntnSignalStrength) {









            // Do nothing









        }









    }









}
























tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java



+59
−47






























Original line number
Diff line number
Diff line







@@ -16,38 +16,37 @@

















package com.android.settings.network.telephony;



















import static com.android.settings.core.BasePreferenceController.AVAILABLE;









import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;









import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;









import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;



















import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;









import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;



















import static com.google.common.truth.Truth.assertThat;



















import static org.mockito.Mockito.spy;









import static org.mockito.Mockito.when;



















import android.content.Context;









import android.os.Looper;









import android.os.PersistableBundle;









import android.platform.test.annotations.DisableFlags;









import android.platform.test.annotations.EnableFlags;









import android.platform.test.flag.junit.SetFlagsRule;









import android.telephony.CarrierConfigManager;









import android.telephony.satellite.SatelliteManager;



















import androidx.preference.Preference;









import androidx.preference.PreferenceCategory;









import androidx.preference.PreferenceManager;









import androidx.preference.PreferenceScreen;









import androidx.test.core.app.ApplicationProvider;









import androidx.test.ext.junit.runners.AndroidJUnit4;



















import com.android.internal.telephony.flags.Flags;









import com.android.settings.network.CarrierConfigCache;









import com.android.settings.R;



















import org.junit.Before;









import org.junit.Rule;









import org.junit.Test;









import org.junit.runner.RunWith;









import org.mockito.Mock;









import org.mockito.junit.MockitoJUnit;









import org.mockito.junit.MockitoRule;



















import java.util.List;



















@RunWith(AndroidJUnit4.class)









public class SatelliteSettingsPreferenceCategoryControllerTest {









    private static final String KEY = "key";








@@ -55,16 +54,9 @@ public class SatelliteSettingsPreferenceCategoryControllerTest {

















    @Rule









    public final MockitoRule mMockitoRule = MockitoJUnit.rule();









    @Rule









    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



















    @Mock









    private CarrierConfigCache mCarrierConfigCache;



















    private Context mContext = null;









    private SatelliteManager mSatelliteManager = null;









    private SatelliteSettingsPreferenceCategoryController mController = null;









    private PersistableBundle mCarrierConfig = new PersistableBundle();



















    @Before









    public void setUp() {








@@ -72,56 +64,76 @@ public class SatelliteSettingsPreferenceCategoryControllerTest {







            Looper.prepare();









        }









        mContext = spy(ApplicationProvider.getApplicationContext());









        mSatelliteManager = new SatelliteManager(mContext);









        CarrierConfigCache.setTestInstance(mContext, mCarrierConfigCache);









        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(mSatelliteManager);









        mController = new SatelliteSettingsPreferenceCategoryController(mContext, KEY);









    }



















    @Test









    @DisableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)









    public void getAvailabilityStatus_featureDisabled_returnUnsupport() {









    public void getAvailabilityStatus_default_returnUnsupported() {









        int result = mController.getAvailabilityStatus(TEST_SUB_ID);



















        assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);









    }



















    @Test









    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)









    public void getAvailabilityStatus_noSatellite_returnUnsupport() {









        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);









        mController = new SatelliteSettingsPreferenceCategoryController(mContext, KEY);









    public void getAvailabilityStatus_hasAvailablePreference_returnAvailableUnsearchable() {









        PreferenceManager preferenceManager = new PreferenceManager(mContext);









        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);









        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);









        preferenceCategory.setKey(KEY);









        preferenceScreen.addPreference(preferenceCategory);









        preferenceCategory.addPreference(new Preference(mContext));









        mController.displayPreference(preferenceScreen);



















        int result = mController.getAvailabilityStatus(TEST_SUB_ID);



















        assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);









        assertThat(result).isEqualTo(AVAILABLE_UNSEARCHABLE);









    }



















    @Test









    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)









    public void getAvailabilityStatus_carrierIsNotSupport_returnUnavailable() {









        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);









        mCarrierConfig.putBoolean(









                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,









                false);









        when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mCarrierConfig);









    public void getAvailabilityStatus_noAvailablePreference_returnUnsupported() {









        PreferenceManager preferenceManager = new PreferenceManager(mContext);









        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);









        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);









        preferenceCategory.setKey(KEY);









        preferenceScreen.addPreference(preferenceCategory);









        mController.displayPreference(preferenceScreen);



















        int result = mController.getAvailabilityStatus(TEST_SUB_ID);



















        assertThat(result).isEqualTo(CONDITIONALLY_UNAVAILABLE);









        assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);









    }



















    @Test









    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)









    public void getAvailabilityStatus_carrierIsSupport_returnAvailable() {









        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);









        mCarrierConfig.putBoolean(









                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,









                true);









        when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mCarrierConfig);









    public void setPreferenceTitle_hasDataService_showConnectivity() {









        PreferenceManager preferenceManager = new PreferenceManager(mContext);









        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);









        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);









        preferenceCategory.setKey(KEY);









        preferenceScreen.addPreference(preferenceCategory);









        preferenceCategory.addPreference(new Preference(mContext));









        mController.displayPreference(preferenceScreen);



















        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(









                List.of(SERVICE_TYPE_DATA));



















        assertThat(preferenceCategory.getTitle()).isEqualTo(









                mContext.getString(R.string.satellite_setting_connectivity));









    }



















        int result = mController.getAvailabilityStatus(TEST_SUB_ID);



















        assertThat(result).isEqualTo(AVAILABLE);









    @Test









    public void setPreferenceTitle_hasSmsService_showMessaging() {









        PreferenceManager preferenceManager = new PreferenceManager(mContext);









        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);









        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);









        preferenceCategory.setKey(KEY);









        preferenceScreen.addPreference(preferenceCategory);









        preferenceCategory.addPreference(new Preference(mContext));









        mController.displayPreference(preferenceScreen);



















        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(









                List.of(SERVICE_TYPE_SMS));



















        assertThat(preferenceCategory.getTitle()).isEqualTo(









                mContext.getString(R.string.satellite_setting_title));









    }









}