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

Commit 8811aaef authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable the new footer actions for everyone"" into tm-qpr-dev am: cdbebee7 

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



Change-Id: Ib00d08e4db44ccef89ac569e6ee7f0d0cfa2b056
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7358cf70 cdbebee7

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
@@ -188,10 +188,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
@@ -169,7 +169,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,