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

Commit 924367f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Implement QS spec."

parents efab39ff d620def5

packages/SystemUI/res/layout/qs_footer_impl.xml

+19 −28
Original line number Diff line number Diff line
@@ -43,40 +43,24 @@ 
        android:layout_gravity="center_vertical"

        android:gravity="end" >



        <LinearLayout

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1" >

            <!-- Add an extra 8dp margin before carrier text without shifting it right -->

            <android.widget.Space

                android:layout_width="8dp"

                android:layout_height="match_parent" />



        <com.android.keyguard.CarrierText

            android:id="@+id/qs_carrier_text"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:layout_marginStart="8dp"

            android:layout_marginEnd="32dp"

            android:gravity="center_vertical|start"

            android:ellipsize="marquee"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="?android:attr/textColorPrimary"

            android:textDirection="locale"

            android:singleLine="true" />

        </LinearLayout>



        <View

            android:id="@+id/qs_drag_handle_view"

            android:layout_width="24dp"

            android:layout_height="4dp"

            android:layout_gravity="center"

            android:background="@drawable/qs_footer_drag_handle" />



        <com.android.keyguard.AlphaOptimizedLinearLayout

            android:id="@+id/qs_footer_actions_container"

            android:layout_width="0dp"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:gravity="center_vertical|end" >

            <com.android.systemui.statusbar.phone.MultiUserSwitch

                android:id="@+id/multi_user_switch"
@@ -139,4 +123,11 @@ 
        </com.android.keyguard.AlphaOptimizedLinearLayout>

    </LinearLayout>



    <View

        android:id="@+id/qs_drag_handle_view"

        android:layout_width="24dp"

        android:layout_height="4dp"

        android:layout_gravity="center"

        android:background="@drawable/qs_footer_drag_handle" />



</com.android.systemui.qs.QSFooterImpl>

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:layout_below="@id/quick_qs_status_icons"

        android:layout_marginStart="@dimen/qs_header_tile_margin_horizontal"

        android:layout_marginEnd="@dimen/qs_header_tile_margin_horizontal"

        android:accessibilityTraversalAfter="@+id/date_time_group"

        android:accessibilityTraversalBefore="@id/expand_indicator"

        android:clipChildren="false"

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

+1 −0
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ 
<resources>

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

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

    <dimen name="qs_header_tile_margin_horizontal">5dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -301,11 +301,13 @@ 
    <dimen name="pull_span_min">25dp</dimen>



    <dimen name="qs_tile_height">106dp</dimen>

    <dimen name="qs_tile_margin">19dp</dimen>

    <dimen name="qs_tile_margin_horizontal">18dp</dimen>

    <dimen name="qs_tile_margin_vertical">24dp</dimen>

    <dimen name="qs_tile_margin_top">18dp</dimen>

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

    <dimen name="qs_quick_tile_padding">12dp</dimen>

    <dimen name="qs_header_gear_translation">16dp</dimen>

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

    <dimen name="qs_page_indicator_width">16dp</dimen>

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

    <dimen name="qs_tile_icon_size">24dp</dimen>

packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -169,10 +169,10 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
    private TouchAnimator createFooterAnimator() {

        return new TouchAnimator.Builder()

                .addFloat(mDivider, "alpha", 0, 1)

                .addFloat(mCarrierText, "alpha", 0, 1)

                .addFloat(mCarrierText, "alpha", 0, 0, 1)

                .addFloat(mActionsContainer, "alpha", 0, 1)

                .addFloat(mDragHandle, "translationY", mDragHandleExpandOffset, 0)

                .addFloat(mDragHandle, "alpha", 1, 0)

                .addFloat(mDragHandle, "alpha", 1, 0, 0)

                .setStartDelay(0.15f)

                .build();

    }