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

Commit 885ff048 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '1609-t-sim_color' into 'v1-t' 

Use SIM color irrespective of modem count

See merge request e/os/android_frameworks_base!175
parents 8a22ee56 fa77cc01

packages/SystemUI/src/com/android/keyguard/KeyguardSimPinViewController.java

+4 −4
Original line number Diff line number Diff line
@@ -316,15 +316,15 @@ public class KeyguardSimPinViewController 
                new int[] { android.R.attr.textColor });

        int color = array.getColor(0, Color.WHITE);

        array.recycle();

        SubscriptionInfo info = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(mSubId);

        if (info != null) {

            color = info.getIconTint();

        }

        if (count < 2) {

            msg = rez.getString(R.string.kg_sim_pin_instructions);

        } else {

            SubscriptionInfo info = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(mSubId);

            CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash

            msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName);

            if (info != null) {

                color = info.getIconTint();

            }

        }

        if (isEsimLocked) {

            msg = rez.getString(R.string.kg_sim_lock_esim_instructions, msg);

packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java

+4 −4
Original line number Diff line number Diff line
@@ -200,15 +200,15 @@ public class KeyguardSimPukViewController 
                new int[] { android.R.attr.textColor });

        int color = array.getColor(0, Color.WHITE);

        array.recycle();

        SubscriptionInfo info = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(mSubId);

        if (info != null) {

            color = info.getIconTint();

        }

        if (count < 2) {

            msg = rez.getString(R.string.kg_puk_enter_puk_hint);

        } else {

            SubscriptionInfo info = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(mSubId);

            CharSequence displayName = info != null ? info.getDisplayName() : "";

            msg = rez.getString(R.string.kg_puk_enter_puk_hint_multi, displayName);

            if (info != null) {

                color = info.getIconTint();

            }

        }

        if (isEsimLocked) {

            msg = rez.getString(R.string.kg_sim_lock_esim_instructions, msg);