ScoopDroid/android_packages_apps_Settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "[Sim UI enhancement] remove the "Tap to show info""

Browse source 
This reverts commit c6eba747db.

Change-Id: Ib8403ca842a4655d1526b27f1965feeee336c687
This commit is contained in:
althafvly 2024-06-27 21:19:52 +05:30 • committed by Michael Bestas
parent 08f05c00ed
commit 9f41becfd6
No known key found for this signature in database
4 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/xml/my_device_info.xml
View file

@ -51,12 +51,11 @@
settings:controller="com.android.settings.deviceinfo.BrandedAccountPreferenceController"/>
<!-- Phone number -->
<Preference
<com.android.settings.deviceinfo.PhoneNumberSummaryPreference
android:key="phone_number"
android:order="3"
android:title="@string/status_number"
android:summary="@string/summary_placeholder"
android:selectable="false"
settings:isPreferenceVisible="@bool/config_show_sim_info"
settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
settings:enableCopying="true"/>
@ -120,6 +119,7 @@
android:key="eid_info"
android:order="31"
android:title="@string/status_eid"
android:summary="@string/device_info_protected_single_press"
android:positiveButtonText="@string/dlg_ok"
android:dialogLayout="@layout/dialog_eid_status"
settings:isPreferenceVisible="@bool/config_show_sim_info"
@ -127,7 +127,7 @@
settings:controller="com.android.settings.deviceinfo.simstatus.SimEidPreferenceController"/>
<!-- IMEI -->
<Preference
<com.android.settings.deviceinfo.PhoneNumberSummaryPreference
android:key="imei_info"
android:order="32"
android:title="@string/status_imei"

27
src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
View file

@ -55,6 +55,27 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public CharSequence getSummary() {
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]", ""));
}
setPhoneNumber(simSlotNumber);
}
return super.handlePreferenceTreeClick(preference);
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
@ -84,7 +105,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber));
setPhoneNumber(simSlotNumber);
simStatusPreference.setSummary(getSummary());
}
}
@ -125,7 +146,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
}
@VisibleForTesting
protected String getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {
protected CharSequence getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {
final String phoneNumber = SubscriptionUtil.getBidiFormattedPhoneNumber(mContext,
subscriptionInfo);
return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
@ -134,6 +155,6 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
@VisibleForTesting
protected Preference createNewPreference(Context context) {
return new Preference(context);
return new PhoneNumberSummaryPreference(context);
}
}

14
src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
View file

@ -33,6 +33,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deviceinfo.PhoneNumberSummaryPreference;
import com.android.settings.deviceinfo.simstatus.SlotSimStatus;
import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.Utils;
@ -112,6 +113,11 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
updatePreference(preference, keyToSlotIndex(preference.getKey()));
}
@Override
public CharSequence getSummary() {
return mContext.getString(R.string.device_info_protected_single_press);
}
private CharSequence getSummary(int simSlot) {
final int phoneType = getPhoneType(simSlot);
return phoneType == PHONE_TYPE_CDMA ? mTelephonyManager.getMeid(simSlot)
@ -145,12 +151,8 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
@VisibleForTesting
protected void updatePreference(Preference preference, int simSlot) {
if (simSlot < 0) {
preference.setVisible(false);
return;
}
preference.setTitle(getTitle(simSlot));
preference.setSummary(getSummary(simSlot));
preference.setSummary(getSummary());
}
private CharSequence getTitleForGsmPhone(int simSlot, boolean isPrimaryImei) {
@ -194,6 +196,6 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
@VisibleForTesting
Preference createNewPreference(Context context) {
return new Preference(context);
return new PhoneNumberSummaryPreference(context);
}
}

4
src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
View file

@ -92,7 +92,6 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) :
}
preference.title = title
preference.dialogTitle = title
preference.summary = eid
updateDialog()
}
}
@ -131,6 +130,9 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) :
val qrCodeView = dialog.requireViewById<ImageView>(R.id.esim_id_qrcode)
qrCodeView.setImageBitmap(getEidQrCode(eid))
// After "Tap to show", eid is displayed on preference.
preference.summary = textView.text
}
override fun handlePreferenceTreeClick(preference: Preference): Boolean {