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

Commit 984f6b75 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Layout notifications on top and introduce artifical margin"

parents 8ec7d60c 8c1a44b6

packages/Keyguard/res/layout/keyguard_status_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:id="@+id/keyguard_status_view"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="wrap_content"

    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:gravity="center_horizontal|top"

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


    <!-- Keyguard dimensions -->

    <!-- Size of the clock font in keyguard's status view -->

    <dimen name="kg_status_clock_font_size">141dp</dimen>

    <dimen name="kg_status_clock_font_size">120dp</dimen>



    <!-- Size of the generic status lines keyguard's status view  -->

    <dimen name="kg_status_line_font_size">16sp</dimen>

packages/Keyguard/res/values-sw720dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<resources>

    <!-- Keyguard dimensions -->

    <!-- Size of the clock font in keyguard's status view -->

    <dimen name="kg_status_clock_font_size">188dp</dimen>

    <dimen name="kg_status_clock_font_size">140dp</dimen>



    <!-- Size of the generic status lines keyguard's status view  -->

    <dimen name="kg_status_line_font_size">19sp</dimen>

packages/SystemUI/res/layout/status_bar_expanded.xml

+29 −35
Original line number Diff line number Diff line
@@ -54,14 +54,6 @@ 
        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/close_handle_underlap"

        android:orientation="vertical"

        android:animateLayoutChanges="false"

        >



    <include layout="@layout/status_bar_expanded_header"

        android:layout_width="match_parent"

        android:layout_height="@dimen/notification_panel_header_height"
@@ -69,6 +61,7 @@ 


    <include

        layout="@layout/keyguard_status_view"

        android:layout_height="wrap_content"

        android:visibility="gone" />



    <TextView
@@ -85,9 +78,11 @@ 
        android:id="@+id/notification_container_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/close_handle_underlap"

        >

        <include

            layout="@layout/flip_settings"

            android:layout_marginTop="@dimen/notification_panel_header_height"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            />
@@ -98,7 +93,6 @@ 
            android:layout_height="wrap_content"

            />

    </FrameLayout>

    </LinearLayout>



    <include

        layout="@layout/keyguard_bottom_area"

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -266,4 +266,6 @@ 


    <dimen name="quick_settings_tmp_scrim_stroke_width">8dp</dimen>

    <dimen name="quick_settings_tmp_scrim_text_size">30dp</dimen>



    <dimen name="notifications_top_padding">8dp</dimen>

</resources>