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

Commit c2c661fc authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Reorder brightness slider mirror in front of album art" into lmp-dev

parents 88dcd1a5 cc74113a

packages/SystemUI/res/layout/super_status_bar.xml

+18 −18
Original line number Diff line number Diff line
@@ -26,24 +26,6 @@ 
    android:fitsSystemWindows="true"

    android:descendantFocusability="afterDescendants">



    <FrameLayout android:id="@+id/brightness_mirror"

            android:layout_width="@dimen/notification_panel_width"

            android:layout_height="wrap_content"

            android:layout_gravity="@integer/notification_panel_layout_gravity"

            android:paddingLeft="@dimen/notification_side_padding"

            android:paddingRight="@dimen/notification_side_padding"

            android:visibility="gone">

        <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:elevation="2dp"

                android:background="@drawable/brightness_mirror_background">

            <include layout="@layout/quick_settings_brightness_dialog"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content" />

        </FrameLayout>

    </FrameLayout>



    <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

            android:id="@+id/backdrop"

            android:layout_width="match_parent"
@@ -69,6 +51,24 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_height" />



    <FrameLayout android:id="@+id/brightness_mirror"

                 android:layout_width="@dimen/notification_panel_width"

                 android:layout_height="wrap_content"

                 android:layout_gravity="@integer/notification_panel_layout_gravity"

                 android:paddingLeft="@dimen/notification_side_padding"

                 android:paddingRight="@dimen/notification_side_padding"

                 android:visibility="gone">

        <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:elevation="2dp"

                android:background="@drawable/brightness_mirror_background">

            <include layout="@layout/quick_settings_brightness_dialog"

                     android:layout_width="match_parent"

                     android:layout_height="wrap_content" />

        </FrameLayout>

    </FrameLayout>



    <com.android.systemui.statusbar.phone.PanelHolder

        android:id="@+id/panel_holder"

        android:layout_width="match_parent"