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

Commit 413bdfde authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "[Bouncer] Add button for esim bouncer." into tm-qpr-dev

parents cf9d368b a6b99ac6

packages/SystemUI/res-keyguard/drawable/kg_bouncer_secondary_button.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<inset xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:insetTop="6dp"

    android:insetBottom="6dp">

    <ripple android:color="?android:attr/colorControlHighlight">

        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

                <solid android:color="?android:attr/textColorSecondary"/>

                <corners android:radius="24dp"/>

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

                <corners android:radius="24dp"/>

                <solid android:color="@android:color/transparent"/>

                <stroke android:color="?androidprv:attr/colorAccentTertiary"

                    android:width="1dp"

                    />

                <padding android:left="16dp"

                    android:top="12dp"

                    android:right="16dp"

                    android:bottom="12dp"/>

            </shape>

        </item>

    </ripple>

</inset>

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

+10 −8
Original line number Diff line number Diff line
@@ -17,15 +17,17 @@ 
*/

-->



<!-- This contains disable esim buttonas shared by sim_pin/sim_puk screens -->

<com.android.keyguard.KeyguardEsimArea

    xmlns:android="http://schemas.android.com/apk/res/android"

<!-- This contains disable eSim buttons shared by sim_pin/sim_puk screens -->

<com.android.keyguard.KeyguardEsimArea xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/keyguard_disable_esim"

    style="@style/Keyguard.TextView"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:id="@+id/keyguard_disable_esim"

    android:visibility="gone"

    android:background="@drawable/kg_bouncer_secondary_button"

    android:drawablePadding="10dp"

    android:drawableStart="@drawable/ic_no_sim"

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

    android:text="@string/disable_carrier_button_text"

    style="@style/Keyguard.TextView"

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

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

    android:textSize="@dimen/kg_status_line_font_size"

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

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

+1 −2
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ 
        <include layout="@layout/keyguard_esim_area"

             android:id="@+id/keyguard_esim_area"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_marginTop="@dimen/eca_overlap" />

             android:layout_height="wrap_content" />

        <RelativeLayout

                android:id="@+id/row0"

                android:layout_width="match_parent"

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

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ 
        <include layout="@layout/keyguard_esim_area"

            android:id="@+id/keyguard_esim_area"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/eca_overlap" />

            android:layout_height="wrap_content" />



        <RelativeLayout

                android:id="@+id/row0"

packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -31,8 +31,4 @@ 
    <!-- Overload default clock widget parameters -->

    <dimen name="widget_big_font_size">100dp</dimen>

    <dimen name="widget_label_font_size">18sp</dimen>



    <!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text.

         Should be 0 on devices with plenty of room (e.g. tablets) -->

    <dimen name="eca_overlap">0dip</dimen>

</resources>