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

Commit 87efc0ac authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am 7cd46429: Merge "apply Jellybean styling to tablet system bar and panel" into jb-dev 

* commit '7cd46429':
  apply Jellybean styling to tablet system bar and panel
parents 33e39aef 7cd46429

packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_notify_bg.9.png

deleted100644 → 0
−3.63 KiB
Loading image diff...

packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_notify_bg.9.png

deleted100644 → 0
−2.15 KiB
Loading image diff...

packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_notify_bg.9.png

deleted100644 → 0
−5.82 KiB
Loading image diff...

packages/SystemUI/res/layout/system_bar_notification_area.xml

+8 −14
Original line number Diff line number Diff line
@@ -78,22 +78,16 @@ 
        android:layout_height="match_parent"

        android:gravity="center"

        >

        <com.android.systemui.statusbar.tablet.HoloClock

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

            android:id="@+id/clock"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="3dip"

            android:layout_marginLeft="8dip"

            android:layout_marginRight="4dip"

            >

            <TextView android:id="@+id/time_solid"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:textAppearance="@style/TextAppearance.StatusBar.Clock"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:singleLine="true"

                android:textSize="40sp"

            android:paddingLeft="6dip"

            android:layout_marginRight="8dip"

            android:gravity="center_vertical|left"

            />

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



        <TextView

            android:id="@+id/network_text"

packages/SystemUI/res/layout/system_bar_notification_panel.xml

+33 −45
Original line number Diff line number Diff line
@@ -18,52 +18,42 @@ 
<com.android.systemui.statusbar.tablet.NotificationPanel

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

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

    android:id="@+id/panel_root"

    android:id="@+id/content_parent"

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:gravity="right"

    >



    <ImageView android:id="@+id/clear_all_button"

        android:layout_width="wrap_content"

        android:layout_height="@*android:dimen/system_bar_height"

    <!-- lift the panel up off the status bar while leaving a touchable are -->

    <Space

        android:id="@+id/system_bar_notification_panel_bottom_space"

        android:layout_height="56dp"

        android:layout_width="478dp"

        android:layout_alignParentRight="true"

        android:layout_alignParentBottom="true"

        android:layout_marginRight="20dp"

        android:paddingLeft="15dp"

        android:paddingRight="15dp"

        android:src="@drawable/ic_notify_clear"

        android:visibility="invisible"

        android:contentDescription="@string/accessibility_clear_all"

        />



    <RelativeLayout

        android:id="@+id/content_parent"

    <LinearLayout

        android:id="@+id/content_frame"

        android:background="@drawable/notification_panel_bg"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_alignParentBottom="true"

        android:layout_width="478dp"

        android:orientation="vertical"

        android:layout_alignParentRight="true"

        android:layout_marginBottom="8dp"

        android:layout_above="@id/system_bar_notification_panel_bottom_space"

        android:paddingBottom="8dp"

        >



        <include layout="@layout/system_bar_notification_panel_title"

            android:layout_width="478dp"

            android:layout_height="224dp"

            android:layout_alignParentTop="true"

            android:layout_width="match_parent"

            android:layout_height="130dp"

            android:layout_above="@id/content_frame"

            android:layout_alignParentRight="true"

            android:layout_weight="0"

            />



        <LinearLayout

            android:id="@+id/content_frame"

            android:background="@drawable/notify_panel_notify_bg"

            android:layout_height="wrap_content"

            android:layout_width="478dp"

            android:orientation="vertical"

            android:layout_alignParentRight="true"

            android:layout_alignParentTop="true"

            android:layout_marginTop="178dp"

            >

        <ScrollView



            android:id="@+id/notification_scroller"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -81,6 +71,4 @@ 
                />

        </ScrollView>

    </LinearLayout>

    </RelativeLayout>



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