From ccae10e692caa55f38eb9ff821fca4e7f822ea4b Mon Sep 17 00:00:00 2001
From: qingxi <qingxi@google.com>
Date: Thu, 3 Aug 2017 16:24:15 -0700
Subject: [PATCH] Fix problems of SIM lock screen of eSIM

This CL fixes following issues:
1. The text on the button currently is black (should be white).
2. Clicking on it turns the screen off but doesn't disable the enabled
profile.

Bug: 64227431
Test: E2E
Change-Id: I87eaeb348c32af610a375912ae0aa5c7aa25dba7
---
 packages/SystemUI/AndroidManifest.xml                          | 1 +
 packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml   | 3 +--
 .../SystemUI/src/com/android/keyguard/KeyguardEsimArea.java    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 24f6c138e0811..c99716084e380 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -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" />
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml
index 8cbd94bd0cb42..db508c91e0de2 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml
@@ -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" />
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java b/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java
index ce3068d765a83..cb5afec79073a 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java
@@ -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);
     }