diff --git a/res/raw/face_settings.mp4 b/res/raw/face_settings.mp4 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml index f5dde8b91a7..ad37a3eec84 100644 --- a/res/xml/security_settings_face.xml +++ b/res/xml/security_settings_face.xml @@ -23,9 +23,8 @@ + app:animation="@raw/face_settings" + app:controller="com.android.settings.biometrics.face.FaceSettingsVideoPreferenceController"/> buildPreferenceControllers(Context context, Lifecycle lifecycle) { final List controllers = new ArrayList<>(); - controllers.add(new FaceSettingsImprovePreferenceController(context)); + controllers.add(new FaceSettingsVideoPreferenceController(context)); controllers.add(new FaceSettingsKeyguardPreferenceController(context)); controllers.add(new FaceSettingsAppPreferenceController(context)); controllers.add(new FaceSettingsAttentionPreferenceController(context)); diff --git a/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java deleted file mode 100644 index 0d841dca21c..00000000000 --- a/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2018 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.biometrics.face; - -import android.content.Context; - -import androidx.preference.Preference; - -import com.android.settings.core.BasePreferenceController; - -/** - * Preference controller which allows the user to update their enrolled face. - */ -public class FaceSettingsImprovePreferenceController extends BasePreferenceController { - - private static final String KEY = "security_settings_face_improve"; - - public FaceSettingsImprovePreferenceController(Context context, String preferenceKey) { - super(context, preferenceKey); - } - - public FaceSettingsImprovePreferenceController(Context context) { - this(context, KEY); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; - } - - @Override - public String getPreferenceKey() { - return KEY; - } - - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } -} diff --git a/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java new file mode 100644 index 00000000000..8c063b523c4 --- /dev/null +++ b/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java @@ -0,0 +1,50 @@ +/* + * 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.biometrics.face; + +import android.content.Context; + +import androidx.preference.PreferenceScreen; + +import com.android.settings.widget.VideoPreference; +import com.android.settings.widget.VideoPreferenceController; + +/** + * Preference controller for the video for face settings. + */ +public class FaceSettingsVideoPreferenceController extends VideoPreferenceController { + + private static final String KEY_VIDEO = "security_settings_face_video"; + + private VideoPreference mVideoPreference; + + public FaceSettingsVideoPreferenceController(Context context, + String preferenceKey) { + super(context, preferenceKey); + } + + public FaceSettingsVideoPreferenceController(Context context) { + this(context, KEY_VIDEO); + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + mVideoPreference = (VideoPreference) screen.findPreference(KEY_VIDEO); + mVideoPreference.onViewVisible(false /* paused */); + } +}