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

Commit ae735c85 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Add ripple and border to emergency call button am: e830adfe 

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

Change-Id: I57449a810865915818d2ecf830c203c94cadce4d
parents 9dbc9b3f e830adfe

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ 
    <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->

    <string name="lockscreen_pattern_instructions">Draw pattern to unlock</string>

    <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->

    <string name="lockscreen_emergency_call">Emergency</string>

    <string name="lockscreen_emergency_call">Emergency call</string>

    <!-- Button at the bottom of the unlock screen that lets the user return to a call -->

    <string name="lockscreen_return_to_call">Return to call</string>

    <!-- Shown to confirm that the user entered their lock pattern correctly. -->

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

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

<!--

  ~ Copyright (C) 2020 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.

  -->

<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="?attr/wallpaperTextColorSecondary"/>

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

        </shape>

    </item>

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

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

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

+4 −5
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        style="@style/Keyguard.TextView"

        android:layout_marginBottom="8dp"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:visibility="gone"
@@ -42,11 +43,9 @@ 
    <com.android.keyguard.EmergencyButton

        android:id="@+id/emergency_call_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginTop="@dimen/eca_overlap"

        android:layout_height="32dp"

        android:layout_marginBottom="12dp"

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

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

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

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



</com.android.keyguard.EmergencyCarrierArea>

packages/SystemUI/res-keyguard/values/styles.xml

+5 −3
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ 
        <item name="android:textColor">?attr/wallpaperTextColorSecondary</item>

        <item name="android:textSize">@dimen/kg_status_line_font_size</item>

    </style>

    <style name="Keyguard.TextView.EmergencyButton" parent="@android:style/DeviceDefault.ButtonBar">

    <style name="Keyguard.TextView.EmergencyButton" parent="Theme.SystemUI">

        <item name="android:textColor">?attr/wallpaperTextColorSecondary</item>

        <item name="android:textSize">@dimen/kg_status_line_font_size</item>

        <item name="android:background">@null</item>

        <item name="android:textSize">14dp</item>

        <item name="android:background">@drawable/kg_emergency_button_background</item>

        <item name="android:paddingLeft">12dp</item>

        <item name="android:paddingRight">12dp</item>

    </style>

    <style name="Widget.TextView.NumPadKey" parent="@android:style/Widget.TextView">

        <item name="android:singleLine">true</item>