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

Commit c345a419 authored by Danny Baumann's avatar Danny Baumann Committed by Steve Kondik
Browse files

Revert "Revert "Improve layout of MSIM SIM PIN/PUK keyguard views."" 

This reverts commit 471f346e and adds
the necessary adaptions to the new MSIM stack.

Change-Id: I5e99996a0f8e1412ae6b7100358698d8fe690988
parent 1bd137dc

packages/Keyguard/res/layout/keyguard_sim_pin_view.xml

+15 −26
Original line number Diff line number Diff line
@@ -28,44 +28,33 @@ 
        androidprv:layout_maxHeight="@dimen/keyguard_security_max_height"

        android:gravity="center_horizontal">



    <ImageView

            android:id="@+id/keyguard_sim"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:src="@drawable/ic_lockscreen_sim"/>

    <LinearLayout

       android:id="@+id/sim_info_message"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:layout_gravity="center_horizontal"

        android:visibility="gone">

        <TextView

            android:id="@+id/slot_id_name"

        android:orientation="horizontal">



        <ImageView

            android:id="@+id/keyguard_sim"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:ellipsize="marquee"

            android:singleLine="true"

            android:textDirection = "locale"

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

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

            android:textSize="16sp"

            />

            android:src="@drawable/ic_lockscreen_sim" />



        <TextView

            android:id="@+id/sub_display_name"

            android:id="@+id/sim_name"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:ellipsize="middle"

            android:maxWidth="110dip"

            android:layout_gravity="center_vertical"

            android:layout_marginStart="16dp"

            android:visibility="gone"

            android:padding="@dimen/sim_card_name_padding"

            android:singleLine="true"

            android:textDirection = "locale"

            android:ellipsize="marquee"

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

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

            android:textSize="16sp"

            />

            android:textColor="?android:attr/textColorPrimary" />



    </LinearLayout>



    <include layout="@layout/keyguard_message_area"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

packages/Keyguard/res/layout/keyguard_sim_puk_view.xml

+15 −27
Original line number Diff line number Diff line
@@ -29,45 +29,33 @@ 
        androidprv:layout_maxHeight="@dimen/keyguard_security_max_height"

        android:gravity="center_horizontal">



    <ImageView

            android:id="@+id/keyguard_sim"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:src="@drawable/ic_lockscreen_sim"/>

    <LinearLayout

       android:id="@+id/sim_info_message"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:layout_gravity="center_horizontal"

        android:visibility="gone"

        >

        <TextView

            android:id="@+id/slot_id_name"

        android:orientation="horizontal">



        <ImageView

            android:id="@+id/keyguard_sim"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:ellipsize="marquee"

            android:singleLine="true"

            android:textDirection = "locale"

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

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

            android:textSize="16sp"

            />

            android:src="@drawable/ic_lockscreen_sim" />



        <TextView

            android:id="@+id/sub_display_name"

            android:id="@+id/sim_name"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:ellipsize="middle"

            android:maxWidth="110dip"

            android:layout_gravity="center_vertical"

            android:layout_marginStart="16dp"

            android:visibility="gone"

            android:padding="@dimen/sim_card_name_padding"

            android:singleLine="true"

            android:textDirection = "locale"

            android:ellipsize="marquee"

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

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

            android:textSize="16sp"

            />

            android:textColor="?android:attr/textColorPrimary" />



    </LinearLayout>



    <include layout="@layout/keyguard_message_area"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

packages/Keyguard/res/values/dimens.xml

+3 −4
Original line number Diff line number Diff line
@@ -178,8 +178,7 @@ 


    <!-- The translation for disappearing security views after having solved them. -->

    <dimen name="disappear_y_translation">-32dp</dimen>

    <!-- For SIM card detection info text max width in SIM card changed dialog -->

    <dimen name="sim_card_name_maxwidth">100dip</dimen>

    <!-- For SIM card name padding in SIM pin/puk unlock and SIM card changed dialog -->

    <dimen name="sim_card_name_padding">6dip</dimen>



    <!-- The padding around the SIM card name -->

    <dimen name="sim_card_name_padding">4dip</dimen>

</resources>

packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java

+19 −37
Original line number Diff line number Diff line
@@ -23,9 +23,8 @@ import android.app.AlertDialog; 
import android.app.AlertDialog.Builder;

import android.app.Dialog;

import android.app.ProgressDialog;

import android.graphics.Color;

import android.content.res.ColorStateList;

import android.graphics.drawable.Drawable;

import android.graphics.Color;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.util.AttributeSet;
@@ -58,7 +57,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
    private AlertDialog mRemainingAttemptsDialog;

    KeyguardUpdateMonitor mKgUpdateMonitor;

    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private TextView mSubDisplayName = null;

    private TextView mSubNameView;

    private ImageView mSimImageView;



    private KeyguardUpdateMonitorCallback mUpdateCallback = new KeyguardUpdateMonitorCallback() {
@@ -147,15 +146,11 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
    protected void onFinishInflate() {

        super.onFinishInflate();



        mSubDisplayName = (TextView) findViewById(R.id.sub_display_name);

        mSubId = mKgUpdateMonitor.getSimPinLockSubId();

        mSubNameView = (TextView) findViewById(R.id.sim_name);

        mSimImageView = (ImageView) findViewById(R.id.keyguard_sim);

        mSubId = mKgUpdateMonitor.getSimPinLockSubId();

        if (mKgUpdateMonitor.getNumPhones() > 1) {



            View simInfoMsg = findViewById(R.id.sim_info_message);

            if (simInfoMsg != null) {

                simInfoMsg.setVisibility(View.VISIBLE);

            }

            mSubNameView.setVisibility(View.VISIBLE);

            handleSubInfoChange();

        }
@@ -357,38 +352,25 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
    }



    private void handleSubInfoChange() {

        String displayName = null;

        //get Display Name

        SubscriptionInfo info =

            SubscriptionManager.from(mContext).getActiveSubscriptionInfo(mSubId);

        if (null != info) {

           displayName = info.getDisplayName().toString();

        CharSequence displayName = null;



        if (info != null) {

            displayName = info.getDisplayName();

        }

        if (displayName == null) {

            displayName = mContext.getString(R.string.kg_slot_name,

                    SubscriptionManager.getSlotId(mSubId) + 1);

        }



        if (DEBUG) Log.i(TAG, "handleSubInfoChange, mSubId=" + mSubId +

                ", displayName=" + displayName);

        mSubNameView.setText(displayName);



        TextView slotName = (TextView)findViewById(R.id.slot_id_name);

        //Set slot display name

        if (null == displayName) {//display name not yet configured.

            if (DEBUG) Log.d(TAG, "mSubId " + mSubId + ": New Card Inserted");

            slotName.setText(mContext.getString(R.string.kg_slot_name,

                    SubscriptionManager.getSlotId(mSubId) + 1));

            slotName.setVisibility(View.VISIBLE);

            mSubDisplayName.setVisibility(View.GONE);

        } else {

            if (DEBUG) Log.d(TAG, "handleSubInfoChange, refresh Sub Info for mSubId=" + mSubId);

            int color = Color.WHITE;

            if (null != info) {

               color = info.getIconTint();

            }

        final int color = info != null && info.getIconTint() != 0

                ? info.getIconTint() : Color.WHITE;

        mSimImageView.setImageTintList(ColorStateList.valueOf(color));

            int simCardNamePadding = getContext().getResources().

                                getDimensionPixelSize(R.dimen.sim_card_name_padding);

            mSubDisplayName.setPadding(simCardNamePadding, 0, simCardNamePadding, 0);

            mSubDisplayName.setText(displayName);

            mSubDisplayName.setVisibility(View.VISIBLE);

            slotName.setVisibility(View.GONE);

        }

    }



    private void showDefaultMessage() {

packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java

+20 −37
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.app.AlertDialog.Builder; 
import android.app.Dialog;

import android.app.ProgressDialog;

import android.graphics.Color;

import android.graphics.drawable.Drawable;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.text.InputType;
@@ -65,7 +64,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { 
    private AlertDialog mRemainingAttemptsDialog;

    KeyguardUpdateMonitor mKgUpdateMonitor;

    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private TextView mSubDisplayName = null;

    private TextView mSubNameView;

    private ImageView mSimImageView;



    private KeyguardUpdateMonitorCallback mUpdateCallback = new KeyguardUpdateMonitorCallback() {
@@ -202,15 +201,11 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { 
    protected void onFinishInflate() {

        super.onFinishInflate();



        mSubDisplayName = (TextView) findViewById(R.id.sub_display_name);

        mSubId = mKgUpdateMonitor.getSimPukLockSubId();

        mSubNameView = (TextView) findViewById(R.id.sim_name);

        mSimImageView = (ImageView) findViewById(R.id.keyguard_sim);

        mSubId = mKgUpdateMonitor.getSimPukLockSubId();

        if (mKgUpdateMonitor.getNumPhones() > 1) {



            View simInfoMsg = findViewById(R.id.sim_info_message);

            if (simInfoMsg != null) {

                simInfoMsg.setVisibility(View.VISIBLE);

            }

            mSubNameView.setVisibility(View.VISIBLE);

            handleSubInfoChange();

        }
@@ -425,38 +420,26 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { 
    }



    private void handleSubInfoChange() {

        String displayName = null;

        //get Display Name

        SubscriptionInfo info =

        final SubscriptionInfo info =

            SubscriptionManager.from(mContext).getActiveSubscriptionInfo(mSubId);

        if (null != info) {

           displayName = info.getDisplayName().toString();

        CharSequence displayName = null;



        if (info != null) {

           displayName = info.getDisplayName();

        }

        if (displayName == null) {

            displayName = mContext.getString(R.string.kg_slot_name,

                    SubscriptionManager.getSlotId(mSubId) + 1);

        }



        if (DEBUG) Log.i(TAG, "handleSubInfoChange, mSubId=" + mSubId +

                ", displayName=" + displayName);



        TextView slotName = (TextView)findViewById(R.id.slot_id_name);

        //Set slot display name

        if (null == displayName) { //display name not yet configured.

            if (DEBUG) Log.d(TAG, "mSubId " + mSubId + ": New Card Inserted");

            slotName.setText(mContext.getString(R.string.kg_slot_name,

                    SubscriptionManager.getSlotId(mSubId) + 1));

            slotName.setVisibility(View.VISIBLE);

            mSubDisplayName.setVisibility(View.GONE);

        } else {

            if (DEBUG) Log.d(TAG, "handleSubInfoChange, refresh Sub Info for mSubId=" + mSubId);

            int color = Color.WHITE;

            if (null != info) {

                color = info.getIconTint();

            }

        mSubNameView.setText(displayName);



        final int color = info != null && info.getIconTint() != 0

                ? info.getIconTint() : Color.WHITE;

        mSimImageView.setImageTintList(ColorStateList.valueOf(color));

            int simCardNamePadding = getContext().getResources().

                                getDimensionPixelSize(R.dimen.sim_card_name_padding);

            mSubDisplayName.setPadding(simCardNamePadding, 0, simCardNamePadding, 0);

            mSubDisplayName.setText(displayName);

            mSubDisplayName.setVisibility(View.VISIBLE);

            slotName.setVisibility(View.GONE);

        }

    }



    private void showDefaultMessage() {