Add face settings video
Test: make -j56 RunSettingsRoboTests Bug: 120991336 Change-Id: I13bc0114d37b97e7d61cafa6df04f2bcab893e81
This commit is contained in:
0
res/raw/face_settings.mp4
Normal file
0
res/raw/face_settings.mp4
Normal file
@@ -23,9 +23,8 @@
|
|||||||
<com.android.settings.widget.VideoPreference
|
<com.android.settings.widget.VideoPreference
|
||||||
android:key="security_settings_face_video"
|
android:key="security_settings_face_video"
|
||||||
android:title="@string/summary_placeholder"
|
android:title="@string/summary_placeholder"
|
||||||
app:animation="@raw/gesture_fingerprint_swipe"
|
app:animation="@raw/face_settings"
|
||||||
app:preview="@drawable/face_enroll_introduction"
|
app:controller="com.android.settings.biometrics.face.FaceSettingsVideoPreferenceController"/>
|
||||||
app:controller="com.android.settings.widget.VideoPreferenceController"/>
|
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="security_settings_face_unlock_category"
|
android:key="security_settings_face_unlock_category"
|
||||||
|
@@ -35,7 +35,6 @@ import com.android.settings.Utils;
|
|||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
import com.android.settings.password.ChooseLockSettingsHelper;
|
import com.android.settings.password.ChooseLockSettingsHelper;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settings.widget.VideoPreferenceController;
|
|
||||||
import com.android.settingslib.core.AbstractPreferenceController;
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
import com.android.settingslib.search.SearchIndexable;
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
@@ -173,7 +172,7 @@ public class FaceSettings extends DashboardFragment {
|
|||||||
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
|
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
|
||||||
Lifecycle lifecycle) {
|
Lifecycle lifecycle) {
|
||||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||||
controllers.add(new FaceSettingsImprovePreferenceController(context));
|
controllers.add(new FaceSettingsVideoPreferenceController(context));
|
||||||
controllers.add(new FaceSettingsKeyguardPreferenceController(context));
|
controllers.add(new FaceSettingsKeyguardPreferenceController(context));
|
||||||
controllers.add(new FaceSettingsAppPreferenceController(context));
|
controllers.add(new FaceSettingsAppPreferenceController(context));
|
||||||
controllers.add(new FaceSettingsAttentionPreferenceController(context));
|
controllers.add(new FaceSettingsAttentionPreferenceController(context));
|
||||||
|
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -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 */);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user