From 6634c159fd8d0ff39646179c0519b7b1b8e19260 Mon Sep 17 00:00:00 2001 From: joshmccloskey Date: Wed, 19 Jun 2019 15:51:56 -0700 Subject: [PATCH] Adding slice for Face Enrollment Fixes: 134965754 Test: Verified slice appears when not enrolled. Test: Verified slice does not appear when enrolled. Test: Verified slice disappears after clicking on icon and going back to settings page. Change-Id: Id1c4458742ab622df8d5881e926fe54684b36843 --- res/drawable/ic_face_24dp.xml | 29 +++++ res/values/strings.xml | 3 +- .../biometrics/face/FaceEnrollEnrolling.java | 5 + .../SettingsContextualCardProvider.java | 7 ++ .../slices/FaceSetupSlice.java | 104 ++++++++++++++++++ .../settings/slices/CustomSliceRegistry.java | 11 ++ .../slices/FaceSetupSliceTest.java | 89 +++++++++++++++ 7 files changed, 247 insertions(+), 1 deletion(-) create mode 100644 res/drawable/ic_face_24dp.xml create mode 100644 src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java create mode 100644 tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java diff --git a/res/drawable/ic_face_24dp.xml b/res/drawable/ic_face_24dp.xml new file mode 100644 index 00000000000..7920c12570e --- /dev/null +++ b/res/drawable/ic_face_24dp.xml @@ -0,0 +1,29 @@ + + + + + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 47a15dd3cbd..8dcf15cd3ac 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -974,7 +974,8 @@ Delete face data? The images and biometric data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern, or password to unlock your phone, sign in to apps, and confirm payments. - + + Use face unlock to unlock your phone diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java index ea2fa5c438b..bf4a1d46187 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java @@ -32,6 +32,7 @@ import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.biometrics.BiometricEnrollSidecar; import com.android.settings.biometrics.BiometricErrorDialog; import com.android.settings.biometrics.BiometricsEnrollEnrolling; +import com.android.settings.slices.CustomSliceRegistry; import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterButton; @@ -184,6 +185,10 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { // TODO: Have this match any animations that UX comes up with if (remaining == 0) { + // Force the reload of the FaceEnroll slice in case a user has enrolled, + // this will cause the slice to no longer appear. + getApplicationContext().getContentResolver().notifyChange( + CustomSliceRegistry.FACE_ENROLL_SLICE_URI, null); launchFinish(mToken); } } diff --git a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java index aaae076e620..385f8cda010 100644 --- a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java +++ b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java @@ -72,6 +72,12 @@ public class SettingsContextualCardProvider extends ContextualCardProvider { .setCardName(contextualAdaptiveSleepSliceUri) .setCardCategory(ContextualCard.Category.DEFAULT) .build(); + final ContextualCard contextualFaceSettingsCard = + ContextualCard.newBuilder() + .setSliceUri(CustomSliceRegistry.FACE_ENROLL_SLICE_URI.toString()) + .setCardName(CustomSliceRegistry.FACE_ENROLL_SLICE_URI.toString()) + .setCardCategory(ContextualCard.Category.DEFAULT) + .build(); final ContextualCardList cards = ContextualCardList.newBuilder() .addCard(wifiCard) .addCard(connectedDeviceCard) @@ -79,6 +85,7 @@ public class SettingsContextualCardProvider extends ContextualCardProvider { .addCard(batteryFixCard) .addCard(notificationChannelCard) .addCard(contextualAdaptiveSleepCard) + .addCard(contextualFaceSettingsCard) .build(); return cards; diff --git a/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java new file mode 100644 index 00000000000..128d76bba2d --- /dev/null +++ b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2019 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.homepage.contextualcards.slices; + + +import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_SUCCESS; + +import android.app.PendingIntent; +import android.app.settings.SettingsEnums; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.hardware.biometrics.BiometricManager; +import android.net.Uri; + +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.ListBuilder.RowBuilder; +import androidx.slice.builders.SliceAction; + +import com.android.settings.R; +import com.android.settings.SubSettings; +import com.android.settings.Utils; +import com.android.settings.biometrics.face.FaceProfileStatusPreferenceController; +import com.android.settings.security.SecuritySettings; +import com.android.settings.slices.CustomSliceRegistry; +import com.android.settings.slices.CustomSliceable; +import com.android.settings.slices.SliceBuilderUtils; + +public class FaceSetupSlice implements CustomSliceable { + + private final Context mContext; + + public FaceSetupSlice(Context context) { + mContext = context; + } + + @Override + public Slice getSlice() { + final BiometricManager biometricManager = mContext.getSystemService(BiometricManager.class); + final PackageManager packageManager = mContext.getPackageManager(); + if (!packageManager.hasSystemFeature(PackageManager.FEATURE_FACE)) { + // no face hardware + return null; + } else if (biometricManager.canAuthenticate() == BIOMETRIC_SUCCESS) { + // face hardware, and already enrolled + return null; + } + + final CharSequence title = mContext.getText( + R.string.security_settings_face_settings_enroll); + final ListBuilder listBuilder = new ListBuilder(mContext, + CustomSliceRegistry.FACE_ENROLL_SLICE_URI, ListBuilder.INFINITY) + .setAccentColor(Utils.getColorAccentDefaultColor(mContext)); + final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_face_24dp); + return listBuilder + .addRow(buildRowBuilder(title, + mContext.getText(R.string.security_settings_face_settings_context_subtitle), + icon, mContext, getIntent())) + .build(); + } + + @Override + public Uri getUri() { + return CustomSliceRegistry.FACE_ENROLL_SLICE_URI; + } + + @Override + public Intent getIntent() { + return SliceBuilderUtils.buildSearchResultPageIntent(mContext, + SecuritySettings.class.getName(), + FaceProfileStatusPreferenceController.KEY_FACE_SETTINGS, + mContext.getText(R.string.security_settings_face_settings_enroll).toString(), + SettingsEnums.SLICE) + .setClassName(mContext.getPackageName(), SubSettings.class.getName()); + } + + private static RowBuilder buildRowBuilder(CharSequence title, CharSequence subTitle, + IconCompat icon, Context context, Intent intent) { + final SliceAction primarySliceAction = SliceAction.createDeeplink( + PendingIntent.getActivity(context, 0, intent, 0), icon, ListBuilder.ICON_IMAGE, + title); + return new RowBuilder() + .setTitleItem(icon, ListBuilder.ICON_IMAGE) + .setTitle(title) + .setSubtitle(subTitle) + .setPrimaryAction(primarySliceAction); + } +} \ No newline at end of file diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java index ebfd7b34e7e..946a9d3dfda 100644 --- a/src/com/android/settings/slices/CustomSliceRegistry.java +++ b/src/com/android/settings/slices/CustomSliceRegistry.java @@ -37,6 +37,7 @@ import com.android.settings.homepage.contextualcards.slices.BatteryFixSlice; import com.android.settings.homepage.contextualcards.slices.BluetoothDevicesSlice; import com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice; import com.android.settings.homepage.contextualcards.slices.ContextualNotificationChannelSlice; +import com.android.settings.homepage.contextualcards.slices.FaceSetupSlice; import com.android.settings.homepage.contextualcards.slices.LowStorageSlice; import com.android.settings.homepage.contextualcards.slices.NotificationChannelSlice; import com.android.settings.location.LocationSlice; @@ -162,6 +163,15 @@ public class CustomSliceRegistry { .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) .appendPath("enhanced_4g_lte") .build(); + /** + * Slice Uri for Face Enrollment + */ + public static final Uri FACE_ENROLL_SLICE_URI = new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) + .authority(SettingsSliceProvider.SLICE_AUTHORITY) + .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) + .appendPath("face_unlock_greeting_card") + .build(); /** * Backing Uri for the Flashlight Slice. */ @@ -347,6 +357,7 @@ public class CustomSliceRegistry { sUriToSlice.put(DATA_USAGE_SLICE_URI, DataUsageSlice.class); sUriToSlice.put(DEVICE_INFO_SLICE_URI, DeviceInfoSlice.class); sUriToSlice.put(EMERGENCY_INFO_SLICE_URI, EmergencyInfoSlice.class); + sUriToSlice.put(FACE_ENROLL_SLICE_URI, FaceSetupSlice.class); sUriToSlice.put(FLASHLIGHT_SLICE_URI, FlashlightSlice.class); sUriToSlice.put(LOCATION_SLICE_URI, LocationSlice.class); sUriToSlice.put(LOW_STORAGE_SLICE_URI, LowStorageSlice.class); diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java new file mode 100644 index 00000000000..f6c1821f120 --- /dev/null +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2019 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.homepage.contextualcards.slices; + +import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_NO_BIOMETRICS; +import static android.hardware.biometrics.BiometricManager.BIOMETRIC_SUCCESS; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; +import android.content.pm.PackageManager; +import android.hardware.biometrics.BiometricConstants; +import android.hardware.biometrics.BiometricManager; + +import androidx.slice.Slice; +import androidx.slice.SliceProvider; +import androidx.slice.widget.SliceLiveData; + +import com.android.settings.R; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + + +@RunWith(RobolectricTestRunner.class) +public class FaceSetupSliceTest { + + private BiometricManager mBiometricManager; + private Context mContext; + private PackageManager mPackageManager; + + @Before + public void setUp() { + // Set-up specs for SliceMetadata. + SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); + mContext = spy(RuntimeEnvironment.application); + mPackageManager = spy(mContext.getPackageManager()); + mBiometricManager = spy(mContext.getSystemService(BiometricManager.class)); + } + + @Test + public void getSlice_noFaceSupported_shouldReturnNull() { + when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(false); + when(mContext.getPackageManager()).thenReturn(mPackageManager); + final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext); + assertThat(setupSlice.getSlice()).isNull(); + } + + @Test + public void getSlice_faceSupportedUserEnrolled_shouldReturnNull() { + when(mBiometricManager.canAuthenticate()).thenReturn(BIOMETRIC_SUCCESS); + when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true); + when(mContext.getPackageManager()).thenReturn(mPackageManager); + when(mContext.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager); + final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext); + assertThat(setupSlice.getSlice()).isNull(); + } + + @Test + public void getSlice_faceSupportedUserNotEnrolled_shouldReturnNonNull() { + when(mBiometricManager.canAuthenticate()).thenReturn(BIOMETRIC_ERROR_NO_BIOMETRICS); + when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true); + when(mContext.getPackageManager()).thenReturn(mPackageManager); + when(mContext.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager); + final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext); + assertThat(setupSlice.getSlice()).isNotNull(); + } +} \ No newline at end of file