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

Merge "Move config_useKeyguardUserSwitcher from sysui overlay to framework." into rvc-dev am: 801f12923d

Browse Source 
Change-Id: I3271d3fed69d56f4949e36824447d655294e288b
This commit is contained in:
Ben Murdoch
2020-03-23 15:01:00 +00:00
committed by Automerger Merge Worker
parent 03e13aa7bb 801f12923d
commit a19e9881f7
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values-sw600dp/config.xml
View File

@@ -45,5 +45,8 @@
<!-- Controls whether the nav bar can move from the bottom to the side in landscape. <!-- Controls whether the nav bar can move from the bottom to the side in landscape.
Only applies if the device display is not square. --> Only applies if the device display is not square. -->
<bool name="config_navBarCanMove">false</bool> <bool name="config_navBarCanMove">false</bool>
<!-- Set to true to enable the user switcher on the keyguard. -->
<bool name="config_keyguardUserSwitcher">true</bool>
</resources> </resources>

4
core/res/res/values/config.xml
View File

@@ -4420,4 +4420,8 @@
<!-- Package name that will receive an explicit manifest broadcast for <!-- Package name that will receive an explicit manifest broadcast for
android.os.action.POWER_SAVE_MODE_CHANGED. --> android.os.action.POWER_SAVE_MODE_CHANGED. -->
<string name="config_powerSaveModeChangedListenerPackage" translatable="false"></string> <string name="config_powerSaveModeChangedListenerPackage" translatable="false"></string>
<!-- Set to true to enable the user switcher on the keyguard. -->
<bool name="config_keyguardUserSwitcher">false</bool>
</resources> </resources>

3
core/res/res/values/symbols.xml
View File

@@ -3939,4 +3939,7 @@
<java-symbol type="string" name="config_customSessionPolicyProvider" /> <java-symbol type="string" name="config_customSessionPolicyProvider" />
<!-- The max scale for the wallpaper when it's zoomed in --> <!-- The max scale for the wallpaper when it's zoomed in -->
<java-symbol type="dimen" name="config_wallpaperMaxScale"/> <java-symbol type="dimen" name="config_wallpaperMaxScale"/>
<!-- Set to true to enable the user switcher on the keyguard. -->
<java-symbol type="bool" name="config_keyguardUserSwitcher" />
</resources> </resources>

3
packages/SystemUI/res/values-sw600dp/config.xml
View File

@@ -26,9 +26,6 @@
<!-- The number of columns that the top level tiles span in the QuickSettings --> <!-- The number of columns that the top level tiles span in the QuickSettings -->
<integer name="quick_settings_user_time_settings_tile_span">1</integer> <integer name="quick_settings_user_time_settings_tile_span">1</integer>
<!-- Set to true to enable the user switcher on the keyguard. -->
<bool name="config_keyguardUserSwitcher">true</bool>
<!-- Nav bar button default ordering/layout --> <!-- Nav bar button default ordering/layout -->
<string name="config_navBarLayout" translatable="false">left;back,home,recent;right</string> <string name="config_navBarLayout" translatable="false">left;back,home,recent;right</string>

3
packages/SystemUI/res/values/config.xml
View File

@@ -175,9 +175,6 @@
be 'platform' or 'noisy' (i.e. for noisy touch screens). --> be 'platform' or 'noisy' (i.e. for noisy touch screens). -->
<string name="velocity_tracker_impl" translatable="false">platform</string> <string name="velocity_tracker_impl" translatable="false">platform</string>
<!-- Set to true to enable the user switcher on the keyguard. -->
<bool name="config_keyguardUserSwitcher">false</bool>
<!-- Doze: does this device support STATE_DOZE? --> <!-- Doze: does this device support STATE_DOZE? -->
<bool name="doze_display_state_supported">false</bool> <bool name="doze_display_state_supported">false</bool>

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
View File

@@ -60,7 +60,8 @@ public class KeyguardUserSwitcher {
KeyguardStatusBarView statusBarView, KeyguardStatusBarView statusBarView,
NotificationPanelViewController panelViewController) { NotificationPanelViewController panelViewController) {
boolean keyguardUserSwitcherEnabled = boolean keyguardUserSwitcherEnabled =
context.getResources().getBoolean(R.bool.config_keyguardUserSwitcher) || ALWAYS_ON; context.getResources().getBoolean(
com.android.internal.R.bool.config_keyguardUserSwitcher) || ALWAYS_ON;
UserSwitcherController userSwitcherController = Dependency.get(UserSwitcherController.class); UserSwitcherController userSwitcherController = Dependency.get(UserSwitcherController.class);
if (userSwitcherController != null && keyguardUserSwitcherEnabled) { if (userSwitcherController != null && keyguardUserSwitcherEnabled) {
mUserSwitcherContainer = (Container) userSwitcher.inflate(); mUserSwitcherContainer = (Container) userSwitcher.inflate();