diff options
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 10 |
3 files changed, 14 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 0e4f965429de..02913c8d2571 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1646,6 +1646,9 @@ 2 - The device DOES NOT have a permanent menu key; ignore autodetection. --> <integer name="config_overrideHasPermanentMenuKey">0</integer> + <!-- Override the DPad detection behavior for configuration purposes --> + <bool name="config_hasPermanentDpad">false</bool> + <!-- default window inset isRound property --> <bool name="config_windowIsRound">false</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e4ca36d6718d..7469772b3b9e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -346,6 +346,7 @@ <java-symbol type="integer" name="config_volte_replacement_rat"/> <java-symbol type="integer" name="config_valid_wappush_index" /> <java-symbol type="integer" name="config_overrideHasPermanentMenuKey" /> + <java-symbol type="bool" name="config_hasPermanentDpad" /> <java-symbol type="color" name="tab_indicator_text_v4" /> diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 9033f3033ba9..a3da1e66c4db 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -333,6 +333,8 @@ public class WindowManagerService extends IWindowManager.Stub final boolean mHaveInputMethods; + final boolean mHasPermanentDpad; + final boolean mAllowBootMessages; final boolean mLimitedAlphaCompositing; @@ -804,6 +806,8 @@ public class WindowManagerService extends IWindowManager.Stub mOnlyCore = onlyCore; mLimitedAlphaCompositing = context.getResources().getBoolean( com.android.internal.R.bool.config_sf_limitedAlpha); + mHasPermanentDpad = context.getResources().getBoolean( + com.android.internal.R.bool.config_hasPermanentDpad); mInputManager = inputManager; // Must be before createDisplayContentLocked. mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class); mDisplaySettings = new DisplaySettings(context); @@ -7182,6 +7186,11 @@ public class WindowManagerService extends IWindowManager.Stub } } + if (config.navigation == Configuration.NAVIGATION_NONAV && mHasPermanentDpad) { + config.navigation = Configuration.NAVIGATION_DPAD; + navigationPresence |= WindowManagerPolicy.PRESENCE_INTERNAL; + } + // Determine whether a hard keyboard is available and enabled. boolean hardKeyboardAvailable = config.keyboard != Configuration.KEYBOARD_NOKEYS; if (hardKeyboardAvailable != mHardKeyboardAvailable) { @@ -10976,6 +10985,7 @@ public class WindowManagerService extends IWindowManager.Stub } pw.println(); pw.print(" mCurConfiguration="); pw.println(this.mCurConfiguration); + pw.print(" mHasPermanentDpad="); pw.println(mHasPermanentDpad); pw.print(" mCurrentFocus="); pw.println(mCurrentFocus); if (mLastFocus != mCurrentFocus) { pw.print(" mLastFocus="); pw.println(mLastFocus); |