PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move lockscreen bypass setting to Settings > Security > Face unlock

Browse Source 
Fixes: 134700640

Test: atest FaceSettingsLockscreenBypassPreferenceControllerTest
Test: enabling/disabling setting through Settings > Security > Face unlock
      works as expected
Test: preference controller no longer seen in Settings > Display > Lock screen display

Change-Id: I54807ad92fac62398a2b9dab93dd638775a09c8d
This commit is contained in:
Kevin Chyn
2019-06-12 11:55:22 -07:00
parent a854373bee
commit 6a4a0e7396
5 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/security/LockscreenBypassPreferenceController.java → src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java
View File

@@ -11,10 +11,10 @@
* 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.
* limitations under the License
*/
package com.android.settings.security;
package com.android.settings.biometrics.face;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -24,12 +24,12 @@ import android.provider.Settings;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.TogglePreferenceController;
public class LockscreenBypassPreferenceController extends TogglePreferenceController {
public class FaceSettingsLockscreenBypassPreferenceController extends TogglePreferenceController {
@VisibleForTesting
protected FaceManager mFaceManager;
public LockscreenBypassPreferenceController(Context context, String preferenceKey) {
public FaceSettingsLockscreenBypassPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {
mFaceManager = context.getSystemService(FaceManager.class);