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

Commit 602fcfac authored by Alexander Hendrich's avatar Alexander Hendrich
Browse files

Hide back button behind flag 

The button has a weird bug (b/432062209), which I can't seem to solve.
Hiding this behind a flag until we find a solution.

Bug: 432062209
Test: atest BouncerContentComposeTest
Flag: com.android.systemui.back_button_on_bouncer

Change-Id: I339cd9f76b155db3491e8f8d77628935a7a97f40
parent ccfd479b

packages/SystemUI/aconfig/desktop_users_and_accounts.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,13 @@ container: "system" 


# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.



flag {

    name: "back_button_on_bouncer"

    namespace: "desktop_users_and_accounts"

    description: "Add a 'back' button to bouncer"

    bug: "432062209"

}



flag {

    name: "disable_double_click_swap_on_bouncer"

    namespace: "desktop_users_and_accounts"

packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerOverlayContentViewModel.kt

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ constructor( 
     * Whether to show a "back" button on bouncer. This is enabled for large screen interaction as

     * these typically don't rely on touch gestures to go back.

     */

    val showBackButton = bouncerInteractor.isImproveLargeScreenInteractionEnabled

    val showBackButton =

        Flags.backButtonOnBouncer() && bouncerInteractor.isImproveLargeScreenInteractionEnabled



    private val _isInputPreferredOnLeftSide = MutableStateFlow(false)

    val isInputPreferredOnLeftSide = _isInputPreferredOnLeftSide.asStateFlow()

packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/composable/BouncerContentComposeTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.bouncer.ui.composable 


import android.app.AlertDialog

import android.content.testableContext

import android.platform.test.annotations.EnableFlags

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.test.assertIsDisplayed
@@ -70,6 +71,7 @@ class BouncerContentComposeTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(com.android.systemui.Flags.FLAG_BACK_BUTTON_ON_BOUNCER)

    fun backButton_shownOnLargeScreens() {

        kosmos.testableContext.orCreateTestableResources.addOverride(

            R.bool.config_improveLargeScreenInteractionOnLockscreen,
@@ -83,6 +85,7 @@ class BouncerContentComposeTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(com.android.systemui.Flags.FLAG_BACK_BUTTON_ON_BOUNCER)

    fun backButton_hiddenOnSmallScreens() {

        kosmos.testableContext.orCreateTestableResources.addOverride(

            R.bool.config_improveLargeScreenInteractionOnLockscreen,