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

Commit 911d4de5 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Use custom drawable for UDFPS enrollment progress bar" into sc-dev am: c0e75307

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

Change-Id: I8eb95a2ecf7e4154d829fb09dfe98c39686bfe70
parents f5d4c422 c0e75307
Loading
Loading
Loading
Loading
+0 −44
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2021 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.
  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:id="@android:id/background">
        <shape
            android:innerRadiusRatio="2.2"
            android:shape="ring"
            android:thickness="@dimen/udfps_enroll_progress_thickness"
            android:useLevel="false"
            android:tint="?android:colorControlNormal">
            <solid android:color="@*android:color/white_disabled_material" />
        </shape>
    </item>
    <item android:id="@android:id/progress">
        <rotate
            android:fromDegrees="270"
            android:pivotX="50%"
            android:pivotY="50%"
            android:toDegrees="270">
            <shape
                android:innerRadiusRatio="2.2"
                android:shape="ring"
                android:thickness="@dimen/udfps_enroll_progress_thickness"
                android:tint="?android:attr/colorControlActivated">
                <solid android:color="@android:color/white" />
            </shape>
        </rotate>
    </item>
</layer-list>
 No newline at end of file
+0 −11
Original line number Diff line number Diff line
@@ -20,17 +20,6 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <!-- Enrollment progress bar -->
    <com.android.systemui.biometrics.UdfpsProgressBar
        android:id="@+id/progress_bar"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:max="100"
        android:padding="@dimen/udfps_enroll_progress_thickness"
        android:progress="0"
        android:layout_gravity="center"
        android:visibility="gone"/>

    <!-- Fingerprint -->
    <ImageView
        android:id="@+id/udfps_enroll_animation_fp_view"
+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@
    <color name="udfps_enroll_icon">#000000</color>                         <!-- 100% black -->
    <color name="udfps_moving_target_fill">#cc4285f4</color>                <!-- 80% blue -->
    <color name="udfps_moving_target_stroke">#ff669DF6</color>              <!-- 100% blue -->
    <color name="udfps_enroll_progress">#ff669DF6</color>                   <!-- 100% blue -->

    <!-- Logout button -->
    <color name="logout_button_bg_color">#ccffffff</color>
+5 −0
Original line number Diff line number Diff line
@@ -630,6 +630,11 @@
        58.0001 29.2229,56.9551 26.8945,55.195
    </string>

    <!-- The radius of the enrollment progress bar, in pixels -->
    <integer name="config_udfpsEnrollProgressBar" translatable="false">
        360
    </integer>

    <!-- package name of a built-in camera app to use to restrict implicit intent resolution
         when the double-press power gesture is used. Ignored if empty. -->
    <string translatable="false" name="config_cameraGesturePackage"></string>
+0 −3
Original line number Diff line number Diff line
@@ -1188,9 +1188,6 @@
    <!-- Y translation for credential contents when animating in -->
    <dimen name="biometric_dialog_credential_translation_offset">60dp</dimen>

    <!-- UDFPS enrollment progress bar thickness -->
    <dimen name="udfps_enroll_progress_thickness">12dp</dimen>

    <!-- Wireless Charging Animation values -->
    <dimen name="wireless_charging_dots_radius_start">0dp</dimen>
    <dimen name="wireless_charging_dots_radius_end">4dp</dimen>
Loading