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

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

Merge "Remove UdfpsEnroll* in system ui."

parents 372ea0e2 d9142311
Loading
Loading
Loading
Loading
+0 −35
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.
  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="54dp"
        android:height="54dp"
        android:viewportWidth="54"
        android:viewportHeight="54">
    <path
        android:pathData="M26.9999,3.9619C39.7029,3.9619 50.0369,14.2969 50.0369,26.9999C50.0369,39.7029 39.7029,50.0379 26.9999,50.0379C14.2969,50.0379 3.9629,39.7029 3.9629,26.9999C3.9629,14.2969 14.2969,3.9619 26.9999,3.9619Z"
        android:fillColor="?android:colorBackground"
        android:fillType="evenOdd"/>
    <path
        android:pathData="M27,0C12.088,0 0,12.088 0,27C0,41.912 12.088,54 27,54C41.912,54 54,41.912 54,27C54,12.088 41.912,0 27,0ZM27,3.962C39.703,3.962 50.037,14.297 50.037,27C50.037,39.703 39.703,50.038 27,50.038C14.297,50.038 3.963,39.703 3.963,27C3.963,14.297 14.297,3.962 27,3.962Z"
        android:fillColor="@color/udfps_enroll_progress"
        android:fillType="evenOdd"/>
    <path
        android:pathData="M23.0899,38.8534L10.4199,26.1824L13.2479,23.3544L23.0899,33.1974L41.2389,15.0474L44.0679,17.8754L23.0899,38.8534Z"
        android:fillColor="@color/udfps_enroll_progress"
        android:fillType="evenOdd"/>
</vector>
+0 −9
Original line number Diff line number Diff line
@@ -100,13 +100,4 @@
    <color name="accessibility_floating_menu_message_text">@*android:color/primary_text_default_material_dark</color>

    <color name="people_tile_background">@color/material_dynamic_secondary20</color>

    <!-- UDFPS colors -->
    <color name="udfps_enroll_icon">#7DA7F1</color>
    <color name="udfps_moving_target_fill">#475670</color>
    <!-- 50% of udfps_moving_target_fill-->
    <color name="udfps_moving_target_fill_error">#80475670</color>
    <color name="udfps_enroll_progress">#7DA7F1</color>
    <color name="udfps_enroll_progress_help">#607DA7F1</color>
    <color name="udfps_enroll_progress_help_with_talkback">#FFEE675C</color>
</resources>
+0 −10
Original line number Diff line number Diff line
@@ -210,16 +210,6 @@
        <attr name="permissionGrantButtonBottomStyle" format="reference"/>
    </declare-styleable>

    <declare-styleable name="BiometricsEnrollView">
        <attr name="biometricsEnrollStyle" format="reference" />
        <attr name="biometricsEnrollIcon" format="reference|color" />
        <attr name="biometricsMovingTargetFill" format="reference|color" />
        <attr name="biometricsMovingTargetFillError" format="reference|color" />
        <attr name="biometricsEnrollProgress" format="reference|color" />
        <attr name="biometricsEnrollProgressHelp" format="reference|color" />
        <attr name="biometricsEnrollProgressHelpWithTalkback" format="reference|color" />
    </declare-styleable>

    <declare-styleable name="SeekBarWithIconButtonsView_Layout">
        <attr name="max" format="integer" />
        <attr name="progress" format="integer" />
+0 −9
Original line number Diff line number Diff line
@@ -136,15 +136,6 @@
    <!-- SFPS colors -->
    <color name="sfps_chevron_fill">@color/material_dynamic_primary90</color>

    <!-- UDFPS colors -->
    <color name="udfps_enroll_icon">#699FF3</color>
    <color name="udfps_moving_target_fill">#C2D7F7</color>
    <!-- 50% of udfps_moving_target_fill-->
    <color name="udfps_moving_target_fill_error">#80C2D7F7</color>
    <color name="udfps_enroll_progress">#699FF3</color>
    <color name="udfps_enroll_progress_help">#70699FF3</color>
    <color name="udfps_enroll_progress_help_with_talkback">#FFEE675C</color>

    <!-- Floating overlay actions -->
    <color name="overlay_button_ripple">#1f000000</color>
    <color name="overlay_background_protection_start">#40000000</color> <!-- 25% black -->
+0 −5
Original line number Diff line number Diff line
@@ -593,11 +593,6 @@
        58.0001 29.2229,56.9551 26.8945,55.195
    </string>

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

    <!-- The time (in ms) needed to trigger the lock icon view's long-press affordance -->
    <integer name="config_lockIconLongPress" translatable="false">200</integer>

Loading