Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable IME on Keyguard Password security challenge" into rvc-dev

Browse Source
This commit is contained in:
Youngjun Kwak
2020-04-21 17:17:13 +00:00
committed by Android (Google) Code Review
parent 3360c54cd6 ec40b3a6b7
commit 965b250bc1
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java
View File

@@ -205,6 +205,9 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override @Override
public void onCancelClicked() { public void onCancelClicked() {
getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false);
getOverlayViewGlobalStateController().setWindowNeedsInput(/* needsInput= */ false);
mBouncer.hide(/* destroyView= */ true); mBouncer.hide(/* destroyView= */ true);
mKeyguardCancelClickedListener.onCancelClicked(); mKeyguardCancelClickedListener.onCancelClicked();
} }
@@ -226,7 +229,8 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override @Override
public void setNeedsInput(boolean needsInput) { public void setNeedsInput(boolean needsInput) {
getLayout().setFocusable(needsInput); getOverlayViewGlobalStateController().setWindowFocusable(needsInput);
getOverlayViewGlobalStateController().setWindowNeedsInput(needsInput);
} }
/** /**

6
packages/CarSystemUI/src/com/android/systemui/window/OverlayViewGlobalStateController.java
View File

@@ -123,6 +123,12 @@ public class OverlayViewGlobalStateController {
mSystemUIOverlayWindowController.setWindowFocusable(focusable); mSystemUIOverlayWindowController.setWindowFocusable(focusable);
} }
/** Sets the {@link android.view.WindowManager.LayoutParams#FLAG_ALT_FOCUSABLE_IM} flag of the
* sysui overlay window */
public void setWindowNeedsInput(boolean needsInput) {
mSystemUIOverlayWindowController.setWindowNeedsInput(needsInput);
}
/** Returns {@code true} if the window is focusable. */ /** Returns {@code true} if the window is focusable. */
public boolean isWindowFocusable() { public boolean isWindowFocusable() {
return mSystemUIOverlayWindowController.isWindowFocusable(); return mSystemUIOverlayWindowController.isWindowFocusable();

10
packages/CarSystemUI/src/com/android/systemui/window/SystemUIOverlayWindowController.java
View File

@@ -132,6 +132,16 @@ public class SystemUIOverlayWindowController implements
updateWindow(); updateWindow();
} }
/** Sets the window to enable IME. */
public void setWindowNeedsInput(boolean needsInput) {
if (needsInput) {
mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
} else {
mLpChanged.flags |= WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
}
updateWindow();
}
/** Returns {@code true} if the window is visible */ /** Returns {@code true} if the window is visible */
public boolean isWindowVisible() { public boolean isWindowVisible() {
return mVisible; return mVisible;