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

Commit f1bbb833 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Tweak FingerprintDialog layout"

parents 28795aa8 d0544dcb

packages/SystemUI/res/drawable/fingerprint_dialog_bg.xml

deleted100644 → 0
+0 −25
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="16dp"

        android:topRightRadius="16dp"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/fingerprint_dialog.xml

+70 −96
Original line number Diff line number Diff line
@@ -35,132 +35,106 @@ 
        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:elevation="2dp"

        android:background="@drawable/fingerprint_dialog_bg">



        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_vertical"

            android:elevation="2dp">



            <ImageView

                android:id="@+id/icon"

                android:layout_width="@dimen/fingerprint_dialog_icon_size"

                android:layout_height="@dimen/fingerprint_dialog_icon_size"

                android:layout_marginTop="16dp"

                android:layout_marginStart="16dp"

                android:scaleType="centerInside" />

        android:background="@color/fingerprint_dialog_bg_color">



        <TextView

            android:id="@+id/title"

            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:layout_toRightOf="@+id/icon"

                android:layout_marginEnd="16dp"

                android:layout_marginStart="16dp"

                android:layout_marginTop="16dp"

            android:layout_marginEnd="24dp"

            android:layout_marginStart="24dp"

            android:layout_marginTop="24dp"

            android:gravity="center"

            android:textSize="20sp"

            android:maxLines="1"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:marqueeRepeatLimit="marquee_forever"

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

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



        <TextView

            android:id="@+id/subtitle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:layout_toRightOf="@+id/icon"

                android:layout_below="@+id/title"

                android:layout_marginEnd="16dp"

                android:layout_marginStart="16dp"

                android:layout_marginTop="4dp"

                android:textSize="12sp"

                android:maxLines="2"

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



        </RelativeLayout>

            android:layout_marginTop="12dp"

            android:layout_marginStart="24dp"

            android:layout_marginEnd="24dp"

            android:gravity="center_horizontal"

            android:textSize="14sp"

            android:maxLines="1"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:marqueeRepeatLimit="marquee_forever"

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



        <TextView

            android:id="@+id/description"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginEnd="16dp"

            android:layout_marginStart="16dp"

            android:paddingTop="16dp"

            android:paddingBottom="20dp"

            android:layout_marginEnd="24dp"

            android:layout_marginStart="24dp"

            android:paddingTop="24dp"

            android:textSize="16sp"

            android:maxLines="4"

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

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



        <ImageView

            android:id="@+id/fingerprint_icon"

            android:layout_width="@dimen/fingerprint_dialog_fp_icon_size"

            android:layout_height="@dimen/fingerprint_dialog_fp_icon_size"

            android:layout_gravity="center_horizontal"

            android:scaleType="centerInside"

            android:contentDescription="@string/accessibility_fingerprint_dialog_fingerprint_icon"

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

            android:layout_marginTop="32dp"

            android:scaleType="fitXY"

            android:contentDescription="@string/accessibility_fingerprint_dialog_fingerprint_icon" />



        <TextView

            android:id="@+id/error"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginEnd = "16dp"

            android:layout_marginStart="16dp"

            android:layout_marginEnd="24dp"

            android:layout_marginStart="24dp"

            android:paddingTop="16dp"

            android:paddingBottom="60dp"

            android:paddingBottom="24dp"

            android:textSize="12sp"

            android:visibility="invisible"

            android:gravity="center_horizontal"

            android:accessibilityLiveRegion="polite"

            android:text="@string/fingerprint_dialog_touch_sensor"

            android:contentDescription="@string/accessibility_fingerprint_dialog_help_area"

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

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



        <LinearLayout android:id="@+id/buttonPanel"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="54dip"

            android:orientation="vertical" >

        <LinearLayout

                style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"

                android:layout_height="wrap_content"

            android:layout_height="72dip"

            android:paddingTop="16dp"

            android:layout_gravity="center_vertical"

            style="?android:attr/buttonBarStyle"

            android:orientation="horizontal"

                android:paddingTop="4dip"

                android:paddingStart="2dip"

                android:paddingEnd="2dip"

            android:measureWithLargestChild="true">

                <LinearLayout android:id="@+id/leftSpacer"

                    android:layout_weight="0.25"

                    android:layout_width="0dip"

                    android:layout_height="wrap_content"

                    android:orientation="horizontal"

                    android:visibility="gone" />

                <!-- Positive Button -->

                <Button android:id="@+id/button1"

                    android:layout_width="0dip"

                    android:layout_gravity="start"

                    android:layout_weight="1"

                    style="?android:attr/buttonBarButtonStyle"

                    android:maxLines="2"

                    android:layout_height="wrap_content"/>

            <Space android:id="@+id/leftSpacer"

                android:layout_width="24dp"

                android:layout_height="match_parent"

                android:visibility="visible" />

            <!-- Negative Button -->

            <Button android:id="@+id/button2"

                    android:layout_width="0dip"

                    android:layout_gravity="end"

                    android:layout_weight="1"

                    style="?android:attr/buttonBarButtonStyle"

                    android:maxLines="2"

                    android:layout_height="wrap_content" />

                <LinearLayout android:id="@+id/rightSpacer"

                    android:layout_width="0dip"

                    android:layout_weight="0.25"

                    android:layout_height="wrap_content"

                    android:orientation="horizontal"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"

                android:layout_marginStart="-12dp"

                android:gravity="start|center_vertical"

                android:maxLines="2" />

            <!-- Positive Button -->

            <Button android:id="@+id/button1"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"

                android:layout_marginEnd="12dp"

                android:maxLines="2" />

            <Space android:id="@+id/rightSpacer"

                android:layout_width="24dip"

                android:layout_height="match_parent"

                android:visibility="gone" />

        </LinearLayout>

    </LinearLayout>

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/values/colors.xml

+4 −2
Original line number Diff line number Diff line
@@ -161,9 +161,11 @@ 


    <!-- Fingerprint dialog colors -->

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

    <color name="fingerprint_dialog_text_color">#ff424242</color> <!-- gray 800-->

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

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

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

    <color name="fingerprint_error_message_color">#ff5722</color>

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

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



    <!-- Logout button -->

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

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ 
    <dimen name="smart_reply_button_font_size">14sp</dimen>

    <dimen name="smart_reply_button_line_spacing_extra">6sp</dimen> <!-- Total line height 20sp. -->



    <dimen name="fingerprint_dialog_icon_size">44dp</dimen>

    <!-- Fingerprint Dialog values -->

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

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

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ 
    <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->

    <string name="cancel">Cancel</string>



    <!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication -->

    <string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string>

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_fingerprint_dialog_fingerprint_icon">Fingerprint icon</string>

    <!-- Content description of the application icon when the system-provided fingerprint dialog is showing, for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->