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

Commit 8f5c440f authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix the problem that the SIM status and IMEI after the "Build number"."... 

Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270337

Change-Id: Ia58371ef266b745efda8d896bd3283ca56ca95a9
parents b9328998 2ea54cc1

res/xml/my_device_info.xml

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
        settings:isPreferenceVisible="false"/>



    <PreferenceCategory

        android:key="basic_info_category"

        android:selectable="false"

        android:title="@string/my_device_info_basic_info_category_title">



        <!-- Device name -->
@@ -88,6 +90,8 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:key="device_detail_category"

        android:selectable="false"

        android:title="@string/my_device_info_device_details_category_title">



        <!-- SIM status -->

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+5 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.widget.Toast; 


import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;
@@ -40,7 +41,8 @@ import java.util.List; 


public class PhoneNumberPreferenceController extends BasePreferenceController {



    private final static String KEY_PHONE_NUMBER = "phone_number";

    private static final String KEY_PHONE_NUMBER = "phone_number";

    private static final String KEY_PREFERENCE_CATEGORY = "basic_info_category";



    private final TelephonyManager mTelephonyManager;

    private final SubscriptionManager mSubscriptionManager;
@@ -66,6 +68,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        final Preference preference = screen.findPreference(getPreferenceKey());

        final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);

        mPreferenceList.add(preference);



        final int phonePreferenceOrder = preference.getOrder();
@@ -76,7 +79,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
            multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);

            multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);

            multiSimPreference.setSelectable(false);

            screen.addPreference(multiSimPreference);

            category.addPreference(multiSimPreference);

            mPreferenceList.add(multiSimPreference);

        }

    }

src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java

+5 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.telephony.TelephonyManager; 
import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;
@@ -42,6 +43,8 @@ import java.util.List; 
 */

public class ImeiInfoPreferenceController extends BasePreferenceController {



    private static final String KEY_PREFERENCE_CATEGORY = "device_detail_category";



    private final boolean mIsMultiSim;

    private final TelephonyManager mTelephonyManager;

    private final List<Preference> mPreferenceList = new ArrayList<>();
@@ -61,6 +64,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        final Preference preference = screen.findPreference(getPreferenceKey());

        final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);



        mPreferenceList.add(preference);

        updatePreference(preference, 0 /* simSlot */);
@@ -72,7 +76,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { 
            final Preference multiSimPreference = createNewPreference(screen.getContext());

            multiSimPreference.setOrder(imeiPreferenceOrder + simSlotNumber);

            multiSimPreference.setKey(getPreferenceKey() + simSlotNumber);

            screen.addPreference(multiSimPreference);

            category.addPreference(multiSimPreference);

            mPreferenceList.add(multiSimPreference);

            updatePreference(multiSimPreference, simSlotNumber);

        }

src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.telephony.TelephonyManager; 
import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;
@@ -37,6 +38,7 @@ public class SimStatusPreferenceController extends 
        AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {



    private static final String KEY_SIM_STATUS = "sim_status";

    private static final String KEY_PREFERENCE_CATEGORY = "device_detail_category";



    private final TelephonyManager mTelephonyManager;

    private final SubscriptionManager mSubscriptionManager;
@@ -64,6 +66,7 @@ public class SimStatusPreferenceController extends 
        if (!isAvailable() || preference == null || !preference.isVisible()) {

            return;

        }

        final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);



        mPreferenceList.add(preference);
@@ -74,7 +77,7 @@ public class SimStatusPreferenceController extends 
            final Preference multiSimPreference = createNewPreference(screen.getContext());

            multiSimPreference.setOrder(simStatusOrder + simSlotNumber);

            multiSimPreference.setKey(KEY_SIM_STATUS + simSlotNumber);

            screen.addPreference(multiSimPreference);

            category.addPreference(multiSimPreference);

            mPreferenceList.add(multiSimPreference);

        }

    }

tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java

+6 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.telephony.SubscriptionManager; 
import android.telephony.TelephonyManager;



import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;
@@ -64,6 +65,8 @@ public class PhoneNumberPreferenceControllerTest { 
    private SubscriptionManager mSubscriptionManager;

    @Mock

    private PreferenceScreen mScreen;

    @Mock

    private PreferenceCategory mCategory;



    private Context mContext;

    private PhoneNumberPreferenceController mController;
@@ -78,6 +81,8 @@ public class PhoneNumberPreferenceControllerTest { 
        final String prefKey = mController.getPreferenceKey();

        when(mScreen.findPreference(prefKey)).thenReturn(mPreference);

        when(mScreen.getContext()).thenReturn(mContext);

        final String categoryKey = "basic_info_category";

        when(mScreen.findPreference(categoryKey)).thenReturn(mCategory);

        doReturn(mSubscriptionInfo).when(mController).getSubscriptionInfo(anyInt());

        doReturn(mSecondPreference).when(mController).createNewPreference(mContext);

        when(mPreference.isVisible()).thenReturn(true);
@@ -105,7 +110,7 @@ public class PhoneNumberPreferenceControllerTest { 


        mController.displayPreference(mScreen);



        verify(mScreen).addPreference(mSecondPreference);

        verify(mCategory).addPreference(mSecondPreference);

    }



    @Test