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

Commit 7cdb4273 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Android (Google) Code Review
Browse files

Merge "Prevent crash when on UserSwitcherActivity rotate" into tm-qpr-dev

parents 7652dc60 4e0cbfbb

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]