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

Commit cf2b199e authored by Joe Onorato's avatar Joe Onorato
Browse files

Updated layouts for new status bar 

Change-Id: I30dc7c458669c4e6a35c67b7815a00ebbbae8dd3
parent 9d305170

packages/SystemUI/res/drawable-nodpi/bg_scrim_notification.png

0 → 100644
+59.4 KiB
Loading image diff...

packages/SystemUI/res/drawable-nodpi/panel_notification.png

0 → 100644
+226 B
Loading image diff...

packages/SystemUI/res/layout-xlarge/status_bar.xml

+10 −7
Original line number Diff line number Diff line
@@ -65,18 +65,21 @@ 
            <LinearLayout

                android:id="@+id/notificationTrigger"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_height="wrap_content"

                >

                <!-- paddingLeft: 24 dips = 32dp (total space to icon) - 8dp in the icon.

                TODO: Make sure the font has a small enough leading that we don't need this

                negative margin business. -->

                <com.android.systemui.statusbar.policy.Clock

                    style="@*android:style/TextAppearance.StatusBar.Icon"

                    android:id="@+id/clock"

                    android:layout_width="64dip"

                    android:layout_height="48dip"

                    android:layout_width="wrap_content"

                    android:layout_height="65dp"

                    android:layout_marginTop="-17dp"

                    android:singleLine="true"

                    android:gravity="center"

                    android:textSize="16sp"

                    android:textStyle="bold"

                    android:padding="2dip"

                    android:textSize="60sp"

                    android:paddingLeft="24dip"

                    android:textColor="#2e2e2e"

                    />

                <ImageView

                    android:id="@+id/battery"

packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml

+114 −97
Original line number Diff line number Diff line
@@ -21,9 +21,21 @@ 
<!--    android:background="@drawable/status_bar_closed_default_background" -->

<com.android.systemui.statusbar.tablet.NotificationPanel

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

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:animateLayoutChanges="true"

    android:background="@drawable/bg_scrim_notification"

    android:paddingLeft="140dp"

    android:paddingBottom="32dp"

    >



    <com.android.systemui.statusbar.tablet.NotificationTitleArea

        android:id="@+id/title_area"

        android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:background="@*android:drawable/dialog_full_holo_dark"

        android:layout_width="384dp"

        android:layout_above="@+id/content_frame"

        android:layout_marginLeft="16dp"

        android:paddingBottom="16dp"

        android:orientation="vertical"

        android:animateLayoutChanges="true"

        >
@@ -33,6 +45,8 @@ 
            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_alignParentTop="true"

            android:layout_marginRight="48dp"

            android:textSize="70sp"

            android:gravity="right"

            />
@@ -41,48 +55,28 @@ 
            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_below="@id/clock"

            android:layout_marginRight="48dp"

            android:gravity="right"

            />



    <ImageView

        android:id="@+id/settings_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@id/date"

        android:layout_alignParentRight="true"

        android:paddingRight="10dp"

        android:src="@drawable/ic_sysbar_quicksettings"

        android:baseline="17dp"

        />



    <ImageView

        android:id="@+id/notification_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignBaseline="@id/settings_button"

        android:layout_alignParentRight="true"

        android:paddingRight="10dp"

        android:visibility="invisible"

        android:src="@drawable/status_bar_veto"

        android:baseline="17dp"

        />



        <ImageView

            android:id="@+id/battery"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_alignParentLeft="true"

        android:layout_alignBaseline="@id/settings_button"

            android:layout_below="@id/date"

            android:layout_marginTop="16dp"

            android:layout_marginLeft="48dp"

            android:src="@drawable/ic_sysbar_battery_mini"

            android:baseline="17dp"

            />



        <TextView

            android:id="@+id/battery_text"

        android:layout_width="wrap_content"

            android:layout_width="48dp"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/battery"

        android:layout_alignBaseline="@id/settings_button"

            android:layout_alignBaseline="@id/battery"

            android:singleLine="true"

            android:text="@string/system_panel_settings_button"

            />
@@ -92,7 +86,7 @@ 
            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_toRightOf="@id/battery_text"

        android:layout_alignBaseline="@id/settings_button"

            android:layout_alignBaseline="@id/battery"

            android:src="@drawable/ic_sysbar_wifi_mini"

            android:baseline="21dp"

            />
@@ -102,23 +96,45 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/network"

        android:layout_alignBaseline="@id/settings_button"

            android:layout_alignBaseline="@id/battery"

            android:singleLine="true"

            android:text="@string/system_panel_settings_button"

            />



    <FrameLayout

        android:id="@+id/settings_frame"

        <ImageView

            android:id="@+id/settings_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_below="@id/settings_button"

            android:layout_alignParentRight="true"

            android:layout_alignBaseline="@id/battery"

            android:paddingRight="16dp"

            android:src="@drawable/ic_sysbar_quicksettings"

            android:baseline="17dp"

            />



        <ImageView

            android:id="@+id/notification_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentRight="true"

            android:layout_alignBaseline="@id/battery"

            android:paddingRight="16dp"

            android:visibility="invisible"

            android:src="@drawable/status_bar_veto"

            android:baseline="17dp"

            />

    </com.android.systemui.statusbar.tablet.NotificationTitleArea>



    <FrameLayout

        android:id="@+id/content_frame"

        android:layout_height="wrap_content"

        android:layout_width="400dp"

        android:layout_alignParentBottom="true"

        >

        <ScrollView

            android:id="@+id/notificationScroller"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

        android:layout_below="@id/settings_button"

            >

            <LinearLayout 

                android:id="@+id/content"
@@ -135,4 +151,5 @@ 
                >

            </LinearLayout>

        </ScrollView>

    </FrameLayout>

</com.android.systemui.statusbar.tablet.NotificationPanel>

packages/SystemUI/res/layout-xlarge/sysbar_panel_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="200dip"

    android:background="#ff000000"

    >

</com.android.systemui.statusbar.tablet.SettingsPanel>