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

Commit 2feceb2c authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Revert "Revert "Enable the new footer actions for everyone"" 

This reverts commit e5b84112.

Test: atest PlatformScnearioTests
Test: atest FooterActionsViewModelTest
Bug: 242040009
Change-Id: I8e8c7993c3d9a90a2b69c48f9b63473fe0913bf2
parent c5bfa992

packages/SystemUI/res-keyguard/layout/footer_actions.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ 
        >

        >





        <com.android.systemui.statusbar.phone.MultiUserSwitch

        <com.android.systemui.statusbar.phone.MultiUserSwitch

            android:id="@+id/multi_user_switch"

            android:id="@id/multi_user_switch"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:background="@drawable/qs_footer_action_circle"

            android:background="@drawable/qs_footer_action_circle"
@@ -61,7 +61,7 @@ 
        </com.android.systemui.statusbar.phone.MultiUserSwitch>

        </com.android.systemui.statusbar.phone.MultiUserSwitch>





        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

            android:id="@+id/settings_button_container"

            android:id="@id/settings_button_container"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:background="@drawable/qs_footer_action_circle"

            android:background="@drawable/qs_footer_action_circle"
@@ -85,7 +85,7 @@ 
        </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

        </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>





        <com.android.systemui.statusbar.AlphaOptimizedImageView

        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/pm_lite"

            android:id="@id/pm_lite"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:background="@drawable/qs_footer_action_circle_color"

            android:background="@drawable/qs_footer_action_circle_color"

packages/SystemUI/res/values/ids.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -188,5 +188,11 @@ 
    <item type="id" name="face_scanning_anim"/>

    <item type="id" name="face_scanning_anim"/>





    <item type="id" name="qqs_tile_layout"/>

    <item type="id" name="qqs_tile_layout"/>



    <!-- The buttons in the Quick Settings footer actions.-->

    <item type="id" name="multi_user_switch"/>

    <item type="id" name="pm_lite"/>

    <item type="id" name="settings_button_container"/>



</resources>

</resources>

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -174,7 +174,7 @@ public class Flags { 
    public static final ResourceBooleanFlag FULL_SCREEN_USER_SWITCHER =

    public static final ResourceBooleanFlag FULL_SCREEN_USER_SWITCHER =

            new ResourceBooleanFlag(506, R.bool.config_enableFullscreenUserSwitcher);

            new ResourceBooleanFlag(506, R.bool.config_enableFullscreenUserSwitcher);





    public static final UnreleasedFlag NEW_FOOTER_ACTIONS = new UnreleasedFlag(507, true);

    public static final ReleasedFlag NEW_FOOTER_ACTIONS = new ReleasedFlag(507);





    /***************************************/

    /***************************************/

    // 600- status bar

    // 600- status bar

packages/SystemUI/src/com/android/systemui/qs/footer/ui/binder/FooterActionsViewBinder.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -222,6 +222,7 @@ object FooterActionsViewBinder { 




    private fun bindButton(button: IconButtonViewHolder, model: FooterActionsButtonViewModel?) {

    private fun bindButton(button: IconButtonViewHolder, model: FooterActionsButtonViewModel?) {

        val buttonView = button.view

        val buttonView = button.view

        buttonView.id = model?.id ?: View.NO_ID

        buttonView.isVisible = model != null

        buttonView.isVisible = model != null

        if (model == null) {

        if (model == null) {

            return

            return

packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsButtonViewModel.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.systemui.common.shared.model.Icon 
 * power buttons.

 * power buttons.

 */

 */

data class FooterActionsButtonViewModel(

data class FooterActionsButtonViewModel(

    val id: Int,

    val icon: Icon,

    val icon: Icon,

    val iconTint: Int?,

    val iconTint: Int?,

    @DrawableRes val background: Int,

    @DrawableRes val background: Int,