Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ceddd8c authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I11afc121713bb0bb78c677188497ebaafe4ca875
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 413220d1 7cdb4273

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ 
                  android:showForAllUsers="true"

                  android:finishOnTaskLaunch="true"

                  android:launchMode="singleInstance"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"

                  android:visibleToInstantApps="true">

        </activity>

packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ constructor( 
    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        setContentView(R.layout.user_switcher_fullscreen)

        window.decorView.getWindowInsetsController().apply {

            setSystemBarsBehavior(BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE)

            hide(Type.systemBars())

        window.decorView.windowInsetsController?.let { controller ->

            controller.systemBarsBehavior = BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE

            controller.hide(Type.systemBars())

        }

        val viewModel =

            ViewModelProvider(this, viewModelFactory.get())[UserSwitcherViewModel::class.java]