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

Commit 7b97503c authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Polish FingerprintDialog" into pi-dev

parents 81cacb27 27e1f26e

packages/SystemUI/res/drawable/fingerprint_dialog_bg.xml

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



<!--

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

  -->



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

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

    <corners android:radius="1dp"

        android:topLeftRadius="@dimen/fingerprint_dialog_corner_size"

        android:topRightRadius="@dimen/fingerprint_dialog_corner_size"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/fingerprint_dialog.xml

+10 −9
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:elevation="2dp"

        android:background="@color/fingerprint_dialog_bg_color">

        android:background="@drawable/fingerprint_dialog_bg">



        <TextView

            android:id="@+id/title"
@@ -45,7 +45,7 @@ 
            android:layout_marginEnd="24dp"

            android:layout_marginStart="24dp"

            android:layout_marginTop="24dp"

            android:gravity="center"

            android:gravity="@integer/fingerprint_dialog_text_gravity"

            android:textSize="20sp"

            android:maxLines="1"

            android:singleLine="true"
@@ -57,16 +57,16 @@ 
            android:id="@+id/subtitle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            android:layout_marginTop="8dp"

            android:layout_marginStart="24dp"

            android:layout_marginEnd="24dp"

            android:gravity="center_horizontal"

            android:textSize="14sp"

            android:gravity="@integer/fingerprint_dialog_text_gravity"

            android:textSize="16sp"

            android:maxLines="1"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:marqueeRepeatLimit="marquee_forever"

            android:textColor="@color/fingerprint_dialog_text_light_color"/>

            android:textColor="@color/fingerprint_dialog_text_dark_color"/>



        <TextView

            android:id="@+id/description"
@@ -74,7 +74,8 @@ 
            android:layout_height="wrap_content"

            android:layout_marginEnd="24dp"

            android:layout_marginStart="24dp"

            android:paddingTop="24dp"

            android:gravity="@integer/fingerprint_dialog_text_gravity"

            android:paddingTop="8dp"

            android:textSize="16sp"

            android:maxLines="4"

            android:textColor="@color/fingerprint_dialog_text_dark_color"/>
@@ -84,7 +85,7 @@ 
            android:layout_width="@dimen/fingerprint_dialog_fp_icon_size"

            android:layout_height="@dimen/fingerprint_dialog_fp_icon_size"

            android:layout_gravity="center_horizontal"

            android:layout_marginTop="32dp"

            android:layout_marginTop="48dp"

            android:scaleType="fitXY"

            android:contentDescription="@string/accessibility_fingerprint_dialog_fingerprint_icon" />
@@ -106,7 +107,7 @@ 
        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="72dip"

            android:paddingTop="16dp"

            android:paddingTop="24dp"

            android:layout_gravity="center_vertical"

            style="?android:attr/buttonBarStyle"

            android:orientation="horizontal"

packages/SystemUI/res/values/colors.xml

+5 −5
Original line number Diff line number Diff line
@@ -160,12 +160,12 @@ 
    <color name="smart_reply_button_background">#fff2f2f2</color>



    <!-- Fingerprint dialog colors -->

    <color name="fingerprint_dialog_bg_color">#f4ffffff</color> <!-- 96% white -->

    <color name="fingerprint_dialog_text_dark_color">#ff212121</color>

    <color name="fingerprint_dialog_text_light_color">#ff757575</color>

    <color name="fingerprint_dialog_bg_color">#ffffffff</color> <!-- 100% white -->

    <color name="fingerprint_dialog_text_dark_color">#dd000000</color> <!-- 87% black -->

    <color name="fingerprint_dialog_text_light_color">#89000000</color> <!-- 54% black -->

    <color name="fingerprint_dialog_dim_color">#80000000</color> <!-- 50% black -->

    <color name="fingerprint_dialog_error_message_color">#ffff5722</color>

    <color name="fingerprint_dialog_fingerprint_color">#ff009688</color>

    <color name="fingerprint_dialog_error_message_color">#ffd93025</color> <!-- google red 600 -->

    <color name="fingerprint_dialog_fingerprint_color">#ff008577</color> <!-- google blue 600 -->



    <!-- Logout button -->

    <color name="logout_button_bg_color">#ccffffff</color>

packages/SystemUI/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -906,8 +906,9 @@ 
    <dimen name="smart_reply_button_line_spacing_extra">6sp</dimen> <!-- Total line height 20sp. -->



    <!-- Fingerprint Dialog values -->

    <dimen name="fingerprint_dialog_fp_icon_size">60dp</dimen>

    <dimen name="fingerprint_dialog_fp_icon_size">64dp</dimen>

    <dimen name="fingerprint_dialog_animation_translation_offset">350dp</dimen>

    <dimen name="fingerprint_dialog_corner_size">2dp</dimen>



    <!-- Wireless Charging Animation values -->

    <dimen name="wireless_charging_dots_radius_start">0dp</dimen>

packages/SystemUI/res/values/integers.xml

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

<!--

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

  -->

<resources>

    <integer name="fingerprint_dialog_text_gravity">8388611</integer> <!-- gravity start -->

</resources>
 
 No newline at end of file