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

Commit e5b84112 authored by Lalit Maganti's avatar Lalit Maganti
Browse files

Revert "Enable the new footer actions for everyone" 

This reverts commit 226f36d2.

Bug: 251156694
Reason for revert: causing Droidmonitored tests to fail - b/251156694

Change-Id: I101111b1f2049f472615ee5d0a72d7e3f36814e3
parent 226f36d2

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

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
        </com.android.systemui.statusbar.phone.MultiUserSwitch>



        <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_height="@dimen/qs_footer_action_button_size"

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



        <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_height="@dimen/qs_footer_action_button_size"

            android:background="@drawable/qs_footer_action_circle_color"

packages/SystemUI/res/values/ids.xml

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



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



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

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

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



</resources>

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

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

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



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

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



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

    // 600- status bar

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

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


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

        val buttonView = button.view

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

        buttonView.isVisible = model != null

        if (model == null) {

            return

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

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

 */

data class FooterActionsButtonViewModel(

    val id: Int?,

    val icon: Icon,

    val iconTint: Int?,

    @DrawableRes val background: Int,