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

Commit 41e0e6fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6 am: 61d8dee2 

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



Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c813dce 61d8dee2

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 








    <!-- Device Info screen. Used for a status item's value when the proper value is not known -->









    <string name="device_info_default">Unknown</string>









    <!-- String for removal of sensitive info on about, depending on tap -->









    <string name="device_info_protected_single_press">Tap to show info</string>









    <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->









    <plurals name="show_dev_countdown">









        <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from being a developer.</item>

























res/xml/my_device_info.xml



+0
−1






























Original line number
Diff line number
Diff line







@@ -57,7 +57,6 @@







            android:order="3"









            android:title="@string/status_number"









            android:summary="@string/summary_placeholder"









            android:selectable="false"









            settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"









            settings:enableCopying="true"/>









    </PreferenceCategory>
































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



+19
−3






























Original line number
Diff line number
Diff line







@@ -56,7 +56,24 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {

















    @Override









    public CharSequence getSummary() {









        return getFirstPhoneNumber();









        return mContext.getString(R.string.device_info_protected_single_press);









    }



















    @Override









    public boolean handlePreferenceTreeClick(Preference preference) {









        String prefKey = preference.getKey();









        if (prefKey.startsWith(KEY_PHONE_NUMBER)) {









            int simSlotNumber = 0;









            if (!TextUtils.equals(prefKey, KEY_PHONE_NUMBER)) {









                // Get multisim slot number from preference key.









                // Multisim preference key is KEY_PHONE_NUMBER + simSlotNumber









                simSlotNumber = Integer.parseInt(









                        prefKey.replaceAll("[^0-9]", ""));









            }









            final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);









            simStatusPreference.setSummary(getPhoneNumber(simSlotNumber));









        }









        return super.handlePreferenceTreeClick(preference);









    }



















    @Override








@@ -73,7 +90,6 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {







            final Preference multiSimPreference = createNewPreference(screen.getContext());









            multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);









            multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);









            multiSimPreference.setSelectable(false);









            category.addPreference(multiSimPreference);









            mPreferenceList.add(multiSimPreference);









        }








@@ -84,7 +100,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {







        for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {









            final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);









            simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber));









            simStatusPreference.setSummary(getPhoneNumber(simSlotNumber));









            simStatusPreference.setSummary(getSummary());









        }









    }










































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



+3
−2






























Original line number
Diff line number
Diff line







@@ -96,7 +96,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {

















    @Override









    public CharSequence getSummary() {









        return getSummary(0);









        return mContext.getString(R.string.device_info_protected_single_press);









    }



















    private CharSequence getSummary(int simSlot) {








@@ -113,6 +113,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {







        }



















        ImeiInfoDialogFragment.show(mFragment, simSlot, preference.getTitle().toString());









        preference.setSummary(getSummary(simSlot));









        return true;









    }


















@@ -129,7 +130,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {

















    private void updatePreference(Preference preference, int simSlot) {









        preference.setTitle(getTitle(simSlot));









        preference.setSummary(getSummary(simSlot));









        preference.setSummary(getSummary());









    }



















    private CharSequence getTitleForGsmPhone(int simSlot) {