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

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

Merge changes I3b129e4b,I489718a8 into jb-dev 

* changes:
  Black out the status bar when the shade comes down.
  Punch up the date contrast.
parents 40013655 8e18dc77

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

+5 −5
Original line number Diff line number Diff line
@@ -26,15 +26,15 @@ 
    android:fitsSystemWindows="true"

    >



    <include layout="@layout/status_bar"

        android:layout_width="match_parent"

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

        />



    <include layout="@layout/status_bar_expanded"

        android:layout_width="@dimen/notification_panel_width"

        android:layout_height="match_parent"

        android:layout_gravity="center_horizontal|top"

        />



    <include layout="@layout/status_bar"

        android:layout_width="match_parent"

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

        />



</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/SystemUI/res/layout/super_status_bar.xml

+4 −4
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ 
    android:fitsSystemWindows="true"

    >



    <include layout="@layout/status_bar_expanded"

    <include layout="@layout/status_bar"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

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

        />



    <include layout="@layout/status_bar"

    <include layout="@layout/status_bar_expanded"

        android:layout_width="match_parent"

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

        android:layout_height="match_parent"

        />



</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/SystemUI/res/values-sw600dp/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
    <!-- Height of search panel including navigation bar height -->

    <dimen name="navbar_search_panel_height">300dip</dimen>



    <!-- Extra space above the clock in the panel; on this device, zero -->

    <dimen name="notification_panel_header_padding_top">0dp</dimen>



    <!-- Size of application thumbnail -->

    <dimen name="status_bar_recents_thumbnail_width">200dp</dimen>

    <dimen name="status_bar_recents_thumbnail_height">177dp</dimen>

packages/SystemUI/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ 
    <!-- Height of the notification panel header bar -->

    <dimen name="notification_panel_header_height">48dp</dimen>



    <!-- Height of the notification panel header bar -->

    <dimen name="notification_panel_padding_top">@*android:dimen/status_bar_height</dimen>

    <!-- Extra space above the panel -->

    <dimen name="notification_panel_padding_top">4dp</dimen>



    <!-- Extra space above the clock in the panel; half of (notification_panel_header_height - 32) -->

    <!-- Extra space above the clock in the panel -->

    <dimen name="notification_panel_header_padding_top">0dp</dimen>



    <!-- Layout parameters for the notification panel -->

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
    <style name="TextAppearance.StatusBar.Expanded.Date">

        <item name="android:textSize">12dp</item>

        <item name="android:textStyle">normal</item>

        <item name="android:textColor">#666666</item>

        <item name="android:textColor">#cccccc</item>

        <item name="android:textAllCaps">true</item>

    </style>