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

Commit 2580827f authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Keyguard - Update emergency button" into sc-dev am: 4a680369 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13463171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If84be8bad4210caa5f92c6679f7b53585ee92a78
parents 9238ae6e 4a680369

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

+3 −4
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?attr/wallpaperTextColorSecondary">

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

        <shape

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

            <stroke android:width="1dp" android:color="?android:attr/textColorSecondary"/>

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
    <com.android.keyguard.EmergencyButton

        android:id="@+id/emergency_call_button"

        android:layout_width="wrap_content"

        android:layout_height="32dp"

        android:layout_height="48dp"

        android:layout_marginBottom="12dp"

        android:text="@*android:string/lockscreen_emergency_call"

        style="@style/Keyguard.TextView.EmergencyButton" />

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

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
              android:layout_height="wrap_content"

              android:orientation="vertical"

              android:layout_gravity="bottom|center_horizontal"

              android:layout_marginTop="@dimen/keyguard_eca_top_margin"

              android:gravity="center_horizontal" />

        </LinearLayout>

    </FrameLayout>

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

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ 
             android:layout_height="wrap_content"

             android:orientation="vertical"

             android:layout_gravity="bottom|center_horizontal"

             android:layout_marginTop="@dimen/keyguard_eca_top_margin"

             android:gravity="center_horizontal"/>



</com.android.keyguard.KeyguardPINView>

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

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ 
             android:layout_height="wrap_content"

             android:orientation="vertical"

             android:layout_gravity="bottom|center_horizontal"

             android:layout_marginTop="@dimen/keyguard_eca_top_margin"

             android:gravity="center_horizontal"/>



</com.android.keyguard.KeyguardSimPinView>