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

Commit 7e6809ad authored by John Spurlock's avatar John Spurlock
Browse files

Common shade width across devices. 

Use 400dp as the visual width of the shade across all devices
and orientations, except small device portrait.

Since the width is now dynamic across orientations, update the
necessary views in SystemUI on rotate.

Remove obsolete styles + resources.

Set max QS columns to 3 on all devices, due to the newer shade
width.

Bug:16825515
Change-Id: Iff171549a79bc318a4d585a2d9ea2af9bc686922
parent 7c7bc7f6

packages/SystemUI/res/layout/heads_up.xml

+4 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- extends FrameLayout -->

<com.android.systemui.statusbar.policy.HeadsUpNotificationView

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_height="match_parent"
@@ -21,11 +22,12 @@ 
        android:background="@drawable/heads_up_scrim">



        <FrameLayout

                android:layout_width="@dimen/notification_panel_width"

                android:layout_height="wrap_content"

                android:layout_gravity="@integer/notification_panel_layout_gravity"

                android:paddingStart="@dimen/notification_side_padding"

                android:paddingEnd="@dimen/notification_side_padding"

                android:elevation="8dp"

                android:id="@+id/content_holder"

                style="@style/NotificationsQuickSettings" />

                android:id="@+id/content_holder" />



</com.android.systemui.statusbar.policy.HeadsUpNotificationView>
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+3 −1
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ 
        android:visibility="invisible" />



    <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer

        style="@style/NotificationsQuickSettings"

        android:layout_width="@dimen/notification_panel_width"

        android:layout_height="match_parent"

        android:layout_gravity="@integer/notification_panel_layout_gravity"

        android:id="@+id/notification_container_parent"

        android:clipToPadding="false"

        android:clipChildren="false">

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"

    android:id="@+id/header"

    style="@style/StatusBarHeader"

    android:layout_width="@dimen/notification_panel_width"

    android:layout_height="@dimen/status_bar_header_height"

    android:layout_gravity="@integer/notification_panel_layout_gravity"

    android:paddingStart="@dimen/notification_side_padding"

    android:paddingEnd="@dimen/notification_side_padding"

    android:baselineAligned="false"

packages/SystemUI/res/layout/volume_dialog.xml

+3 −1
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
     limitations under the License.

-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="@dimen/volume_panel_width"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginLeft="@dimen/notification_side_padding"

    android:layout_marginRight="@dimen/notification_side_padding"

    android:background="@drawable/qs_background_primary"

    android:translationZ="@dimen/volume_panel_z"

    android:layout_marginBottom="@dimen/volume_panel_z">

packages/SystemUI/res/values-land/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
     value at runtime for some things) -->

    <integer name="status_bar_recents_bg_gradient_degrees">90</integer>



    <!-- The number of columns in the QuickSettings -->

    <integer name="quick_settings_num_columns">4</integer>



    <!-- The maximum number of rows in the QuickSettings -->

    <integer name="quick_settings_max_rows">2</integer>