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

Commit 870b69b0 authored by Maurice Lam's avatar Maurice Lam
Browse files

Add skip button to fingerprint enrolling screen 

Test: Manual
Bug: 62839648
Change-Id: I3f05c64eb5b88cd91c8c98b02845a99df2d27203
parent e2859904

res/layout-land/fingerprint_enroll_enrolling.xml

+13 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
                style="@style/SuwGlifIcon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="?attr/suwGlifHeaderGravity"

                android:layout_marginStart="0dp"

                android:layout_marginEnd="0dp"

                android:src="@drawable/ic_fingerprint_header" />
@@ -82,6 +83,18 @@ 


            </FrameLayout>



            <Space

                android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <Button

                android:id="@+id/skip_button"

                style="@style/SuwGlifButton.Secondary"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/skip_label" />



        </LinearLayout>



        <FrameLayout

res/layout/fingerprint_enroll_enrolling_base.xml

+4 −3
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 


<com.android.setupwizardlib.GlifLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    style="?attr/fingerprint_layout_theme">

    style="?attr/fingerprint_layout_theme"

    app:suwFooter="@layout/fingerprint_enroll_enrolling_base_footer">



    <LinearLayout

        style="@style/SuwContentFrame"
@@ -58,8 +60,7 @@ 
        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:paddingBottom="80dp">

            android:layout_weight="1">



            <include layout="@layout/fingerprint_enroll_enrolling_content"

                android:layout_width="@dimen/fingerprint_progress_bar_max_size"

res/layout/fingerprint_enroll_enrolling_base_footer.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2017 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.

-->



<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/SuwGlifButtonBar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <Button

        style="@style/SuwGlifButton.Secondary"

        android:id="@+id/skip_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/skip_label" />



</LinearLayout>

src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java

+17 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;

import android.widget.Button;

import android.widget.ProgressBar;

import android.widget.TextView;
@@ -98,6 +99,10 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase 
        mRepeatMessage = (TextView) findViewById(R.id.repeat_message);

        mErrorText = (TextView) findViewById(R.id.error_text);

        mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar);



        Button skipButton = findViewById(R.id.skip_button);

        skipButton.setOnClickListener(this);



        final LayerDrawable fingerprintDrawable = (LayerDrawable) mProgressBar.getBackground();

        mIconAnimationDrawable = (AnimatedVectorDrawable)

                fingerprintDrawable.findDrawableByLayerId(R.id.fingerprint_animation);
@@ -211,6 +216,18 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase 
        super.onBackPressed();

    }



    @Override

    public void onClick(View v) {

        switch (v.getId()) {

            case R.id.skip_button:

                setResult(RESULT_SKIP);

                finish();

                break;

            default:

                super.onClick(v);

        }

    }



    private void animateProgress(int progress) {

        if (mProgressAnim != null) {

            mProgressAnim.cancel();