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

Commit e0b4fe59 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Rebuilt notification list using a new custom layout."

parents 5891f55a d42497e5

packages/SystemUI/res/layout-sw600dp/status_bar_notification_row.xml

+1 −1
Original line number Diff line number Diff line 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="65dp"

    android:layout_height="@dimen/notification_height"

    >



    <ImageButton

packages/SystemUI/res/layout/status_bar_expanded.xml

+9 −5
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
*/

-->



<com.android.systemui.statusbar.phone.ExpandedView xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.systemui.statusbar.phone.ExpandedView 

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

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

    android:orientation="vertical"

    android:focusable="true"

    android:descendantFocusability="afterDescendants"
@@ -97,10 +99,11 @@ 
                    android:textAppearance="@style/TextAppearance.StatusBar.Title"

                    android:text="@string/status_bar_ongoing_events_title"

                    />

                <LinearLayout android:id="@+id/ongoingItems"

                <com.android.systemui.statusbar.policy.NotificationRowLayout

                    android:id="@+id/ongoingItems"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    systemui:rowHeight="@dimen/notification_height"

                    />



                <TextView android:id="@+id/latestTitle"
@@ -111,10 +114,11 @@ 
                    android:textAppearance="@style/TextAppearance.StatusBar.Title"

                    android:text="@string/status_bar_latest_events_title"

                    />

                <LinearLayout android:id="@+id/latestItems"

                <com.android.systemui.statusbar.policy.NotificationRowLayout

                    android:id="@+id/latestItems"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    systemui:rowHeight="@dimen/notification_height"

                    />

            </LinearLayout>

        </ScrollView>

packages/SystemUI/res/layout/status_bar_notification_row.xml

+1 −1
Original line number Diff line number Diff line 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="65dp"

    android:layout_height="@dimen/notification_height"

    >



    <ImageButton

packages/SystemUI/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -24,5 +24,8 @@ 
    <declare-styleable name="NotificationLinearLayout">

        <attr name="insetLeft" format="dimension" />

    </declare-styleable>

    <declare-styleable name="NotificationRowLayout">

        <attr name="rowHeight" format="dimension" />

    </declare-styleable>

</resources>

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -47,5 +47,8 @@ 


    <!-- thickness (height) of the navigation bar on phones that require it -->

    <dimen name="navigation_bar_size">42dp</dimen>



    <!-- thickness (height) of each notification row, including any separators or padding -->

    <dimen name="notification_height">65dp</dimen>

</resources>