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

Commit b3b0140d authored by Rohan Shah's avatar Rohan Shah Committed by android-build-merger
Browse files

Merge "[QS] Add PageIndicator to footer" into pi-dev 

am: 84745ebe

Change-Id: Ib1687654181f9ab0c44017e180f74ed7edaadfc9
parents 4cfbfda1 84745ebe

packages/SystemUI/res/layout/qs_footer_impl.xml

+34 −20
Original line number Diff line number Diff line
@@ -38,24 +38,28 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginStart="16dp"

        android:layout_gravity="center_vertical"

        android:gravity="end" >



        <LinearLayout

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:gravity="center_vertical|start"

            android:paddingStart="16dp">



            <include

                layout="@layout/mobile_signal_group"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:layout_gravity="center_vertical|start"

                android:layout_marginEnd="8dp"

            android:visibility="gone"

            layout="@layout/mobile_signal_group" />

                android:visibility="gone" />



            <com.android.keyguard.CarrierText

                android:id="@+id/qs_carrier_text"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

            android:layout_gravity="center_vertical|start"

                android:layout_marginEnd="32dp"

                android:ellipsize="marquee"

                android:textAppearance="@style/TextAppearance.QS.TileLabel"
@@ -63,10 +67,20 @@ 
                android:textDirection="locale"

                android:singleLine="true" />



        </LinearLayout>



        <com.android.systemui.qs.PageIndicator

            android:id="@+id/footer_page_indicator"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_gravity="center_vertical"

            android:visibility="gone" />



        <com.android.keyguard.AlphaOptimizedLinearLayout

            android:id="@+id/qs_footer_actions_container"

            android:layout_width="wrap_content"

            android:layout_width="@integer/qs_footer_actions_width"

            android:layout_height="match_parent"

            android:layout_weight="@integer/qs_footer_actions_weight"

            android:gravity="center_vertical|end" >

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

                android:id="@+id/multi_user_switch"

packages/SystemUI/res/layout/qs_paged_tile_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingBottom="24dp"

    android:clipChildren="false"

    android:clipToPadding="false">

    android:clipToPadding="false"

    android:paddingBottom="@dimen/qs_paged_tile_layout_padding_bottom">



    <FrameLayout

        android:id="@+id/page_decor"

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

+1 −0
Original line number Diff line number Diff line
@@ -35,4 +35,5 @@ 
    <integer name="quick_settings_num_columns">4</integer>

    <bool name="quick_settings_wide">true</bool>

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

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

</resources>

packages/SystemUI/res/values-land/integers.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<resources>

    <!-- Action footer width is set to 0 to allow it to stretch (through a weight of 1) and center

         the page indicator in between the footer and the carrier text.-->

    <integer name="qs_footer_actions_width">0</integer>

    <integer name="qs_footer_actions_weight">1</integer>

</resources>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ 
    <dimen name="qs_footer_padding_start">16dp</dimen>

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

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

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



    <dimen name="qs_notif_collapsed_space">64dp</dimen>