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

Commit e8d01e26 authored by Qingxi Li's avatar Qingxi Li Committed by Android (Google) Code Review
Browse files

Merge "Fix problems of SIM lock screen of eSIM" into oc-mr1-dev

parents 52bffa52 ccae10e6

packages/SystemUI/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
    <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />



    <!-- Keyguard -->

    <uses-permission android:name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />

    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />

    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

    <uses-permission android:name="android.permission.GET_ACCOUNTS" />

packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 
    android:id="@+id/keyguard_disable_esim"

    android:visibility="gone"

    android:text="@string/disable_carrier_button_text"

    style="?android:attr/buttonBarButtonStyle"

    style="@style/Keyguard.TextView"

    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textSize="@dimen/kg_status_line_font_size"

    android:textColor="?android:attr/textColorSecondary"

    android:textAllCaps="@bool/kg_use_all_caps" />

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

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ class KeyguardEsimArea extends Button implements View.OnClickListener { 
    public KeyguardEsimArea(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        mEuiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);

        setOnClickListener(this);

    }