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

Commit ece4a834 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed focusing order for the notification panel and QS" into lmp-dev

parents f9220b39 e32010ac

packages/Keyguard/res/layout/keyguard_status_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 
    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:gravity="center_horizontal|top">

    <LinearLayout

        android:id="@+id/keyguard_clock_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal|top"

        android:orientation="vertical"

        android:focusable="true">

        android:orientation="vertical" >

        <TextClock

            android:id="@+id/clock_view"

            android:layout_width="wrap_content"

packages/SystemUI/res/layout/qs_detail.xml

+4 −2
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 
                android:layout_marginEnd="8dp"

                android:minWidth="132dp"

                android:text="@string/quick_settings_more_settings"

                android:textAppearance="@style/TextAppearance.QS.DetailButton" />

                android:textAppearance="@style/TextAppearance.QS.DetailButton"

                android:focusable="true" />



        <TextView

                android:id="@android:id/button1"
@@ -50,7 +51,8 @@ 
                android:layout_height="wrap_content"

                android:minWidth="88dp"

                android:text="@string/quick_settings_done"

                android:textAppearance="@style/TextAppearance.QS.DetailButton" />

                android:textAppearance="@style/TextAppearance.QS.DetailButton"

                android:focusable="true"/>



    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_detail_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    android:layout_height="wrap_content"

    android:layout_alignParentBottom="true"

    android:padding="@dimen/qs_panel_padding"

    android:visibility="invisible"

    android:background="@drawable/btn_borderless_rect" >



    <TextView

packages/SystemUI/res/layout/status_bar_expanded.xml

+5 −5
Original line number Diff line number Diff line
@@ -50,10 +50,6 @@ 
        android:visibility="gone"

        />



    <include

        layout="@layout/keyguard_bottom_area"

        android:visibility="gone" />



    <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -117,6 +113,10 @@ 


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



    <include

            layout="@layout/keyguard_bottom_area"

            android:visibility="gone" />



    <include layout="@layout/status_bar_expanded_header" />



    <com.android.systemui.statusbar.AlphaOptimizedView

packages/SystemUI/res/layout/status_bar_notification_dismiss_all.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:layout_height="wrap_content"

        android:visibility="gone"

        >

    <ImageButton

    <com.android.systemui.statusbar.DismissViewImageButton

            android:id="@+id/dismiss_text"

            android:layout_width="48dp"

            android:layout_height="48dp"