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

Commit 70a031fe authored by Maurice Lam's avatar Maurice Lam
Browse files

Update buttons in FP find sensor 

Remove the next button (so the user has to touch the sensor to
proceed), and add a skip button.

Test: cd tests/robotests && mma
Bug: 62839648
Change-Id: I555948ac2f3235e08b91f0957aa8e0ce24535c08
parent e2859904

res/layout-land/fingerprint_enroll_find_sensor.xml

+10 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="match_parent"

                android:orientation="vertical"

                android:clipChildren="false"

                android:clipToPadding="false">
@@ -52,6 +52,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" />
@@ -70,13 +71,18 @@ 
                    android:layout_height="wrap_content"

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



                <Space

                    android:layout_width="0dp"

                    android:layout_height="0dp"

                    android:layout_weight="1" />



                <Button

                    style="@style/SetupWizardButton.Positive"

                    android:id="@+id/next_button"

                    style="@style/SetupWizardButton.Negative"

                    android:id="@+id/skip_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="8dp"

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

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



            </LinearLayout>

res/layout/fingerprint_enroll_find_sensor_base.xml

+4 −2
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"

    style="?attr/fingerprint_layout_theme"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">



    <FrameLayout

        android:layout_width="match_parent"
@@ -56,7 +58,7 @@ 
                android:layout_weight="1"/>



            <Button

                style="@style/SuwGlifButton.Primary"

                style="@style/SuwGlifButton.Secondary"

                android:id="@+id/next_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

res/layout/fingerprint_enroll_find_sensor_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/FingerprintEnrollFindSensor.java

+13 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.support.annotation.Nullable;

import android.view.View;

import android.widget.Button;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;
@@ -48,6 +49,9 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(getContentView());

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

        skipButton.setOnClickListener(this);



        setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);

        if (savedInstanceState != null) {

            mLaunchedConfirmLock = savedInstanceState.getBoolean(EXTRA_KEY_LAUNCHED_CONFIRM);
@@ -132,9 +136,15 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { 
    }



    @Override

    protected void onNextButtonClick() {

        mNextClicked = true;

        proceedToEnrolling(true /* cancelEnrollment */);

    public void onClick(View v) {

        switch (v.getId()) {

            case R.id.skip_button:

                setResult(RESULT_SKIP);

                finish();

                break;

            default:

                super.onClick(v);

        }

    }



    private void proceedToEnrolling(boolean cancelEnrollment) {

tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml

+4 −2
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"

    style="?attr/fingerprint_layout_theme"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">



    <FrameLayout

        android:layout_width="match_parent"
@@ -65,7 +67,7 @@ 
                android:layout_weight="1"/>



            <Button

                style="@style/SuwGlifButton.Primary"

                style="@style/SuwGlifButton.Secondary"

                android:id="@+id/next_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"