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

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

Merge "Update Biometrics Face Education illustratiion for exrpessive style" into main

parents 271c3ca8 5dd4bbab
Loading
Loading
Loading
Loading
+45 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2025 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="@dimen/face_enroll_icon_large_width"
    android:height="@dimen/face_enroll_icon_large_height"
    android:viewportWidth="300"
    android:viewportHeight="300"
    android:tint="@color/face_enroll_icon_color">

    <path
        android:fillColor="#FF000000"
        android:fillType="evenOdd"
        android:pathData="M150,0C67.16,0,0,67.16,0,150s67.16,150,150,150 s150-67.16,150-150S232.84,0,150,0 M150,4c39,0,75.66,15.19,103.24,42.76C280.81,74.34,296,111,296,150s-15.19,75.66-42.76,103.24 C225.66,280.81,189,296,150,296s-75.66-15.19-103.24-42.76C19.19,225.66,4,189,4,150S19.19,74.34,46.76,46.76 C74.34,19.19,111,4,150,4" />
    <path
        android:fillColor="#FF000000"
        android:fillType="evenOdd"
        android:pathData="M220,120c0,5.52-4.48,10-10,10s-10-4.48-10-10 s4.48-10,10-10S220,114.48,220,120" />
    <path
        android:fillColor="#FF000000"
        android:fillType="evenOdd"
        android:pathData="M90,130c-5.52,0-10-4.48-10-10s4.48-10,10-10 s10,4.48,10,10S95.52,130,90,130" />
    <path
        android:fillColor="#FF000000"
        android:fillType="evenOdd"
        android:pathData="M164.2,215.88c-3.83,3.25-8.79,5.22-14.2,5.22 c-12.13,0-22-9.87-22-22c0-0.03,0-0.06,0-0.09l-8-0.03c0,0.04,0,0.08,0,0.13c0,6.24,1.9,12.03,5.16,16.83 c5.4,7.95,14.51,13.17,24.84,13.17c1.04,0,2.06-0.05,3.08-0.15c6.18-0.63,11.81-3.14,16.3-6.95L164.2,215.88z" />
    <path
        android:fillColor="#FF000000"
        android:fillType="evenOdd"
        android:pathData="M 153 140 L 153 166 L 137 166 L 137 174 L 161 174 L 161 140 Z" />
</vector>
 No newline at end of file
+11 −0
Original line number Diff line number Diff line
@@ -97,6 +97,17 @@
                    android:layout_marginBottom="@dimen/limited_vision_button_margin_bottom"
                    android:text="@string/security_settings_face_enroll_introduction_accessibility"/>

                <com.google.android.material.button.MaterialButton
                    android:id="@+id/accessibility_button_expressive"
                    style="@style/Widget.Material3.Button.TonalButton"
                    android:layout_gravity="center"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="@dimen/limited_vision_button_margin_top"
                    android:layout_marginBottom="@dimen/limited_vision_button_margin_bottom"
                    android:visibility="gone"
                    android:text="@string/security_settings_face_enroll_introduction_accessibility"/>

                <com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle
                    android:id="@+id/toggle_diversity"
                    android:layout_width="match_parent"
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

+4 −6
Original line number Diff line number Diff line
@@ -14,15 +14,13 @@
     limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- Dark theme customization for lottie illustration. Not translatable. -->
    <string-array name="va_animation_customization" translatable="false">
    <!-- Light theme customization for Face Education lottie illustration. Not translatable. -->
    <string-array name="fac_education_illustration" translatable="false">
        <item>.surfaceContainer:@sud_system_surface_container_dark</item>
        <item>.primary:@sud_system_primary_dark</item>
        <item>.primaryContainer:@sud_system_primary_container_dark</item>
        <item>.onPrimary:@sud_system_on_primary_dark</item>
        <item>.sContainerLowest:@sud_system_surface_container_lowest_dark</item>
        <item>.secondaryContainer:@sud_system_secondary_container_dark</item>
        <item>.onSecondary:@sud_system_on_secondary_dark</item>
        <item>.outline:@sud_system_outline_dark</item>
        <item>.onSecondaryContainer:@sud_system_secondary_container_dark</item>
        <item>.tertiary:@sud_system_tertiary_dark</item>
        <item>.inversePrimary:@sud_system_primary_inverse_dark</item>
    </string-array>
+4 −6
Original line number Diff line number Diff line
@@ -14577,15 +14577,13 @@ Data usage charges may apply.</string>
    <string name="supervision_pin_reset_success_toast">PIN updated</string>
    <string name="accessibility_illustration_content_description"><xliff:g id="feature" example="Select to Speak">%1$s</xliff:g> animation</string>
    <!-- Light theme customization for lottie illustration. Not translatable. -->
    <string-array name="va_animation_customization" translatable="false">
    <!-- Light theme customization for Face Education lottie illustration. Not translatable. -->
    <string-array name="fac_education_illustration" translatable="false">
        <item>.surfaceContainer:@sud_system_surface_container_light</item>
        <item>.primary:@sud_system_primary_light</item>
        <item>.primaryContainer:@sud_system_primary_container_light</item>
        <item>.onPrimary:@sud_system_on_primary_light</item>
        <item>.sContainerLowest:@sud_system_surface_container_lowest_light</item>
        <item>.secondaryContainer:@sud_system_secondary_container_light</item>
        <item>.onSecondary:@sud_system_on_secondary_light</item>
        <item>.outline:@sud_system_outline_light</item>
        <item>.onSecondaryContainer:@sud_system_secondary_container_light</item>
        <item>.tertiary:@sud_system_tertiary_light</item>
        <item>.inversePrimary:@sud_system_primary_inverse_light</item>
    </string-array>
Loading