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

Merge "Prevent crash when on UserSwitcherActivity rotate" into tm-qpr-dev am: 7cdb42734e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20739266

Change-Id: I11afc121713bb0bb78c677188497ebaafe4ca875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brad Hinegardner
2022-12-16 16:06:17 +00:00
committed by Automerger Merge Worker
parent 413220d1b4 7cdb42734e
commit 6ceddd8c53
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/AndroidManifest.xml
View File

@@ -886,7 +886,7 @@
android:showForAllUsers="true" android:showForAllUsers="true"
android:finishOnTaskLaunch="true" android:finishOnTaskLaunch="true"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:configChanges="screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
android:visibleToInstantApps="true"> android:visibleToInstantApps="true">
</activity> </activity>

6
packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt
View File

@@ -39,9 +39,9 @@ constructor(
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.user_switcher_fullscreen) setContentView(R.layout.user_switcher_fullscreen)
window.decorView.getWindowInsetsController().apply { window.decorView.windowInsetsController?.let { controller ->
setSystemBarsBehavior(BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE) controller.systemBarsBehavior = BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
hide(Type.systemBars()) controller.hide(Type.systemBars())
} }
val viewModel = val viewModel =
ViewModelProvider(this, viewModelFactory.get())[UserSwitcherViewModel::class.java] ViewModelProvider(this, viewModelFactory.get())[UserSwitcherViewModel::class.java]