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

Commit 2fef19dd authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Add pulsing animation for find sensor.

Bug: 20495507
Change-Id: I5fefb2cdb2625885c906fa2a9b69da1141ce66e0
parent 5ad75f07
Loading
Loading
Loading
Loading
−13.8 KiB (4.56 KiB)
Loading image diff...
+6 −10
Original line number Diff line number Diff line
@@ -58,17 +58,13 @@
        <FrameLayout
            android:layout_width="0dp"
            android:layout_weight="1"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical">
            android:layout_height="match_parent">

            <ImageView
                android:id="@+id/fingerprint_sensor_location"
                android:layout_width="200dp"
                android:layout_height="200dp"
                android:layout_gravity="center"
                android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
                android:src="@drawable/fingerprint_sensor_location"
                android:scaleType="centerInside"/>
            <include
                layout="@layout/fingerprint_enroll_find_sensor_graphic"
                android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
                android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
                android:layout_gravity="center"/>

        </FrameLayout>

+5 −8
Original line number Diff line number Diff line
@@ -37,15 +37,12 @@
            android:layout_marginTop="@dimen/suw_description_margin_top"
            android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>

        <ImageView
            android:id="@+id/fingerprint_sensor_location"
            android:layout_width="204dp"
            android:layout_height="204dp"
        <include
            layout="@layout/fingerprint_enroll_find_sensor_graphic"
            android:layout_marginTop="32dp"
            android:layout_gravity="center_horizontal"
            android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
            android:src="@drawable/fingerprint_sensor_location"
            android:scaleType="centerInside"/>
            android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
            android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
            android:layout_gravity="center_horizontal"/>

        <View
            android:layout_height="0dp"
+36 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2015 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
  -->

<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
    android:layout_height="@dimen/fingerprint_find_sensor_graphic_size">

    <ImageView
        android:id="@+id/fingerprint_sensor_location"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
        android:src="@drawable/fingerprint_sensor_location"
        android:scaleType="centerInside"/>

    <com.android.settings.fingerprint.FingerprintLocationAnimationView
        android:id="@+id/fingerprint_sensor_location_animation"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>

</FrameLayout>
+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@
    <color name="fingerprint_message_color">#de000000</color>
    <color name="fingerprint_progress_ring">#ff009688</color>
    <color name="fingerprint_progress_ring_bg">#20000000</color>
    <color name="fingerprint_dot_color">#ff009688</color>

    <color name="running_processes_system_ram">#ff384248</color>
    <color name="running_processes_apps_ram">#ff009587</color>
Loading