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

Commit 34a181ac authored by Maurice Lam's avatar Maurice Lam
Browse files

Create add more fingerprint suggestion for setup 

Create FingerprintSuggestionActivity which is a suggestion shown in
setup to allow the user to add more fingerprints for unlocking the
device.

Test: cd tests/robotests && mma
Bug: 62638180
Change-Id: Icfab9bd2523fdeadc4cc6f0ad4f45606260c4755
parent 6dfafa5d

AndroidManifest.xml

+24 −18
Original line number Diff line number Diff line
@@ -1583,24 +1583,6 @@ 
            android:windowSoftInputMode="stateHidden|adjustResize"

            android:theme="@style/GlifTheme.Light"/>



        <activity

            android:name=".Settings$FingerprintSuggestionActivity"

            android:label="@string/security_settings_fingerprint_preference_title"

            android:icon="@drawable/ic_suggestion_fingerprint">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

            <meta-data android:name="com.android.settings.dismiss"

                android:value="5,9,30" />

            <meta-data android:name="com.android.settings.require_feature"

                android:value="android.hardware.fingerprint" />

            <meta-data android:name="com.android.settings.title"

                android:resource="@string/suggestion_additional_fingerprints" />

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/suggestion_additional_fingerprints_summary" />

        </activity>



        <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>

        <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>

        <activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
@@ -1620,6 +1602,30 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".fingerprint.FingerprintSuggestionActivity"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:icon="@drawable/ic_suggestion_fingerprint"

            android:theme="@style/GlifTheme.Light">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.FINGERPRINT_ENROLL" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

            <meta-data android:name="com.android.settings.dismiss"

                android:value="5,9,30" />

            <meta-data android:name="com.android.settings.require_feature"

                android:value="android.hardware.fingerprint" />

            <meta-data android:name="com.android.settings.title"

                android:resource="@string/suggestion_additional_fingerprints" />

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/suggestion_additional_fingerprints_summary" />

            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />

        </activity>



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name=".password.ConfirmLockPattern$InternalActivity"

            android:exported="false"

src/com/android/settings/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ public class Settings extends SettingsActivity { 


    public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }

    public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }

    public static class FingerprintSuggestionActivity extends FingerprintSettings { /* empty */ }

    public static class FingerprintEnrollSuggestionActivity extends FingerprintEnrollIntroduction {

        /* empty */

    }

src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java

+1 −1
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ import android.support.annotation.VisibleForTesting; 
import com.android.ims.ImsManager;

import com.android.settings.Settings.CameraLiftTriggerSuggestionActivity;

import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;

import com.android.settings.Settings.FingerprintSuggestionActivity;

import com.android.settings.Settings.ScreenLockSuggestionActivity;

import com.android.settings.Settings.WifiCallingSuggestionActivity;

import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;

import com.android.settings.Utils;

import com.android.settings.fingerprint.FingerprintSuggestionActivity;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.wallpaper.WallpaperSuggestionActivity;

import com.android.settingslib.drawer.Tile;

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * 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

 */



package com.android.settings.fingerprint;



import android.widget.Button;



import com.android.settings.R;



public class FingerprintSuggestionActivity extends SetupFingerprintEnrollIntroduction {



    @Override

    protected void initViews() {

        super.initViews();



        final Button cancelButton = findViewById(R.id.fingerprint_cancel_button);

        cancelButton.setText(R.string.security_settings_fingerprint_enroll_introduction_cancel);

    }



    @Override

    public void finish() {

        // Always use RESULT_CANCELED because this action can be done multiple times

        setResult(RESULT_CANCELED);

        super.finish();

    }

}

tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java

0 → 100644
+96 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */



package com.android.settings.fingerprint;





import static com.google.common.truth.Truth.assertThat;



import static org.robolectric.RuntimeEnvironment.application;



import android.app.Activity;

import android.app.KeyguardManager;

import android.content.Intent;

import android.content.pm.UserInfo;

import android.view.View;

import android.widget.Button;



import com.android.settings.R;

import com.android.settings.TestConfig;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.shadow.ShadowEventLogWriter;

import com.android.settings.testutils.shadow.ShadowLockPatternUtils;

import com.android.settings.testutils.shadow.ShadowUserManager;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.Shadows;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowActivity;

import org.robolectric.shadows.ShadowKeyguardManager;

import org.robolectric.util.ActivityController;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        shadows = {

                ShadowEventLogWriter.class,

                ShadowLockPatternUtils.class,

                ShadowUserManager.class

        })

public class FingerprintSuggestionActivityTest {



    @Mock

    private UserInfo mUserInfo;



    private ActivityController<FingerprintSuggestionActivity> mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        final Intent intent = new Intent();

        mController = Robolectric.buildActivity(FingerprintSuggestionActivity.class, intent);



        ShadowUserManager.getShadow().setUserInfo(0, mUserInfo);

    }



    @Test

    public void testKeyguardSecure_shouldFinishWithFingerprintResultSkip() {

        getShadowKeyguardManager().setIsKeyguardSecure(true);



        mController.create().resume();



        final Button cancelButton = mController.get().findViewById(R.id.fingerprint_cancel_button);

        assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");

        assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE);

        cancelButton.performClick();



        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());

        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();

        assertThat(shadowActivity.getResultCode()).named("Result code")

                .isEqualTo(Activity.RESULT_CANCELED);

    }



    private ShadowKeyguardManager getShadowKeyguardManager() {

        return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));

    }

}