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

Commit 1940892d authored by Adrian Roos's avatar Adrian Roos
Browse files

QS: Make user switcher expand when users don't fit 

Also updates the switcher to match the latest redlines.

Bug: 16406694
Change-Id: Ibf44ed9ea2ef4e3c467724eb4c79f1df5b3e49f4
parent dd06d040

packages/SystemUI/res/layout/data_usage.xml

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="16dp"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"

    android:orientation="vertical" >



    <TextView

packages/SystemUI/res/layout/qs_detail.xml

+37 −33
Original line number Diff line number Diff line
@@ -14,39 +14,43 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/qs_detail_background"

    android:padding="16dp" >

        android:paddingBottom="16dp"

        android:orientation="vertical">



    <TextView

        android:id="@android:id/button1"

        style="@style/QSBorderlessButton"

        android:layout_width="wrap_content"

    <FrameLayout

            android:id="@android:id/content"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />



    <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

        android:minWidth="88dp"

        android:layout_alignParentBottom="true"

        android:layout_alignParentEnd="true"

        android:text="@string/quick_settings_done"

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

            android:paddingEnd="16dp"

            android:gravity="end">



        <TextView

                android:id="@android:id/button2"

                style="@style/QSBorderlessButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

                android:layout_marginEnd="8dp"

                android:minWidth="132dp"

        android:layout_toStartOf="@android:id/button1"

                android:text="@string/quick_settings_more_settings"

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



    <FrameLayout

        android:id="@android:id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_above="@android:id/button1" />

        <TextView

                android:id="@android:id/button1"

                style="@style/QSBorderlessButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:minWidth="88dp"

                android:text="@string/quick_settings_done"

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



</RelativeLayout>
 
 No newline at end of file
 
    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_detail_items.xml

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ 
<!-- extends FrameLayout -->

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    android:layout_height="match_parent"

    android:paddingTop="16dp"

    android:paddingStart="16dp"

    android:paddingEnd="16dp">



    <LinearLayout

        android:id="@android:id/list"

packages/SystemUI/res/layout/qs_user_detail.xml

+5 −7
Original line number Diff line number Diff line
@@ -16,14 +16,12 @@ 
  ~ limitations under the License

  -->



<!-- GridView -->

<!-- PseudoGridView -->

<com.android.systemui.qs.tiles.UserDetailView

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

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:verticalSpacing="4dp"

        android:horizontalSpacing="4dp"

        android:numColumns="3"

        android:listSelector="@drawable/ripple_drawable">



</com.android.systemui.qs.tiles.UserDetailView>
 
 No newline at end of file
 
        sysui:verticalSpacing="4dp"

        sysui:horizontalSpacing="4dp"

        style="@style/UserDetailView" />
 
 No newline at end of file

packages/SystemUI/res/layout/qs_user_detail_item.xml

+3 −2
Original line number Diff line number Diff line
@@ -25,16 +25,17 @@ 
        android:orientation="vertical"

        android:gravity="top|center_horizontal"

        android:paddingTop="16dp"

        android:paddingBottom="20dp"

        android:minHeight="112dp"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:background="@drawable/ripple_drawable"

        systemui:activatedFontFamily="sans-serif-medium">



    <com.android.systemui.statusbar.phone.UserAvatarView

            android:id="@+id/user_picture"

            android:layout_width="@dimen/max_avatar_size"

            android:layout_height="@dimen/max_avatar_size"

            android:layout_marginBottom="12dp"

            android:layout_marginBottom="10dp"

            systemui:frameWidth="2dp"

            systemui:framePadding="6dp"

            systemui:activeFrameColor="@color/current_user_border_color"/>