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

Commit 028755f0 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Add face settings video"

parents 6f8934bf 51fe2e9c

res/raw/face_settings.mp4

0 → 100644
+0 −0

Empty file added.

res/xml/security_settings_face.xml

+2 −3
Original line number Diff line number Diff line
@@ -23,9 +23,8 @@ 
    <com.android.settings.widget.VideoPreference

        android:key="security_settings_face_video"

        android:title="@string/summary_placeholder"

        app:animation="@raw/gesture_fingerprint_swipe"

        app:preview="@drawable/face_enroll_introduction"

        app:controller="com.android.settings.widget.VideoPreferenceController"/>

        app:animation="@raw/face_settings"

        app:controller="com.android.settings.biometrics.face.FaceSettingsVideoPreferenceController"/>



    <PreferenceCategory

        android:key="security_settings_face_unlock_category"

src/com/android/settings/biometrics/face/FaceSettings.java

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.settings.Utils; 
import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.VideoPreferenceController;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.search.SearchIndexable;
@@ -173,7 +172,7 @@ public class FaceSettings extends DashboardFragment { 
    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

            Lifecycle lifecycle) {

        final List<AbstractPreferenceController> 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));

src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java→src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java

+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 * 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.
@@ -18,37 +18,33 @@ package com.android.settings.biometrics.face; 


import android.content.Context;



import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.widget.VideoPreference;

import com.android.settings.widget.VideoPreferenceController;



/**

 * Preference controller which allows the user to update their enrolled face.

 * Preference controller for the video for face settings.

 */

public class FaceSettingsImprovePreferenceController extends BasePreferenceController {

public class FaceSettingsVideoPreferenceController extends VideoPreferenceController {



    private static final String KEY = "security_settings_face_improve";

    private static final String KEY_VIDEO = "security_settings_face_video";



    public FaceSettingsImprovePreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

    }



    public FaceSettingsImprovePreferenceController(Context context) {

        this(context, KEY);

    }

    private VideoPreference mVideoPreference;



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

    public FaceSettingsVideoPreferenceController(Context context,

            String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    public String getPreferenceKey() {

        return KEY;

    public FaceSettingsVideoPreferenceController(Context context) {

        this(context, KEY_VIDEO);

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        return false;

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mVideoPreference = (VideoPreference) screen.findPreference(KEY_VIDEO);

        mVideoPreference.onViewVisible(false /* paused */);

    }

}