Separate keyguard message area between bouncer and alt bouncer. Ensure that the separation is clear and understandable. Insert keyguard message area for bouncer into the security view so the layout is better. Fixes: 242186543, 240328688 Test: Add unit tests and tested on multiple devices and view modes. Change-Id: Iff34f1ebe108649c454691d14054072af46bfad8
163 lines
5.6 KiB
Java
163 lines
5.6 KiB
Java
/*
|
|
* Copyright (C) 2020 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.keyguard;
|
|
|
|
import android.util.Log;
|
|
import android.view.LayoutInflater;
|
|
|
|
import com.android.internal.annotations.VisibleForTesting;
|
|
import com.android.keyguard.KeyguardInputViewController.Factory;
|
|
import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
|
|
import com.android.keyguard.dagger.KeyguardBouncerScope;
|
|
import com.android.systemui.R;
|
|
import com.android.systemui.util.ViewController;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
import javax.inject.Inject;
|
|
|
|
/**
|
|
* Controller for a {@link KeyguardSecurityViewFlipper}.
|
|
*/
|
|
@KeyguardBouncerScope
|
|
public class KeyguardSecurityViewFlipperController
|
|
extends ViewController<KeyguardSecurityViewFlipper> {
|
|
|
|
private static final boolean DEBUG = KeyguardConstants.DEBUG;
|
|
private static final String TAG = "KeyguardSecurityView";
|
|
|
|
private final List<KeyguardInputViewController<KeyguardInputView>> mChildren =
|
|
new ArrayList<>();
|
|
private final LayoutInflater mLayoutInflater;
|
|
private final EmergencyButtonController.Factory mEmergencyButtonControllerFactory;
|
|
private final Factory mKeyguardSecurityViewControllerFactory;
|
|
|
|
@Inject
|
|
protected KeyguardSecurityViewFlipperController(KeyguardSecurityViewFlipper view,
|
|
LayoutInflater layoutInflater,
|
|
KeyguardInputViewController.Factory keyguardSecurityViewControllerFactory,
|
|
EmergencyButtonController.Factory emergencyButtonControllerFactory) {
|
|
super(view);
|
|
mKeyguardSecurityViewControllerFactory = keyguardSecurityViewControllerFactory;
|
|
mLayoutInflater = layoutInflater;
|
|
mEmergencyButtonControllerFactory = emergencyButtonControllerFactory;
|
|
}
|
|
|
|
@Override
|
|
protected void onViewAttached() {
|
|
|
|
}
|
|
|
|
@Override
|
|
protected void onViewDetached() {
|
|
|
|
}
|
|
|
|
public void reset() {
|
|
for (KeyguardInputViewController<KeyguardInputView> child : mChildren) {
|
|
child.reset();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reload colors of ui elements upon theme change.
|
|
*/
|
|
public void reloadColors() {
|
|
for (KeyguardInputViewController<KeyguardInputView> child : mChildren) {
|
|
child.reloadColors();
|
|
}
|
|
}
|
|
|
|
@VisibleForTesting
|
|
KeyguardInputViewController<KeyguardInputView> getSecurityView(SecurityMode securityMode,
|
|
KeyguardSecurityCallback keyguardSecurityCallback) {
|
|
KeyguardInputViewController<KeyguardInputView> childController = null;
|
|
for (KeyguardInputViewController<KeyguardInputView> child : mChildren) {
|
|
if (child.getSecurityMode() == securityMode) {
|
|
childController = child;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (childController == null
|
|
&& securityMode != SecurityMode.None && securityMode != SecurityMode.Invalid) {
|
|
|
|
int layoutId = getLayoutIdFor(securityMode);
|
|
KeyguardInputView view = null;
|
|
if (layoutId != 0) {
|
|
if (DEBUG) Log.v(TAG, "inflating id = " + layoutId);
|
|
view = (KeyguardInputView) mLayoutInflater.inflate(
|
|
layoutId, mView, false);
|
|
mView.addView(view);
|
|
childController = mKeyguardSecurityViewControllerFactory.create(
|
|
view, securityMode, keyguardSecurityCallback);
|
|
childController.init();
|
|
|
|
mChildren.add(childController);
|
|
}
|
|
}
|
|
|
|
if (childController == null) {
|
|
childController = new NullKeyguardInputViewController(
|
|
securityMode, keyguardSecurityCallback,
|
|
mEmergencyButtonControllerFactory.create(null));
|
|
}
|
|
|
|
return childController;
|
|
}
|
|
|
|
private int getLayoutIdFor(SecurityMode securityMode) {
|
|
switch (securityMode) {
|
|
case Pattern: return R.layout.keyguard_pattern_view;
|
|
case PIN: return R.layout.keyguard_pin_view;
|
|
case Password: return R.layout.keyguard_password_view;
|
|
case SimPin: return R.layout.keyguard_sim_pin_view;
|
|
case SimPuk: return R.layout.keyguard_sim_puk_view;
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/** Makes the supplied child visible if it is contained win this view, */
|
|
public void show(KeyguardInputViewController<KeyguardInputView> childController) {
|
|
int index = childController.getIndexIn(mView);
|
|
if (index != -1) {
|
|
mView.setDisplayedChild(index);
|
|
}
|
|
}
|
|
|
|
private static class NullKeyguardInputViewController
|
|
extends KeyguardInputViewController<KeyguardInputView> {
|
|
protected NullKeyguardInputViewController(SecurityMode securityMode,
|
|
KeyguardSecurityCallback keyguardSecurityCallback,
|
|
EmergencyButtonController emergencyButtonController) {
|
|
super(null, securityMode, keyguardSecurityCallback, emergencyButtonController,
|
|
null);
|
|
}
|
|
|
|
@Override
|
|
public boolean needsInput() {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public void onStartingToHide() {
|
|
}
|
|
}
|
|
}
|