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

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

Merge changes from topic "split-shade-cherry-pick-v2" into sc-v2-dev 

* changes:
  Always have QS expanded on split shade
  Remove split shade drag handle
  Always show collapsed media on split shade
  Split shade should always have 6 tiles
parents c4392736 294f8c51

packages/SystemUI/res/drawable/ic_qs_drag_handle.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 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

  -->

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

    android:width="36dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

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

        android:pathData="M5.41,7.59L4,9l8,8 8,-8 -1.41,-1.41L12,14.17" />

</vector>

packages/SystemUI/res/layout/qs_panel.xml

+0 −13
Original line number Diff line number Diff line
@@ -56,17 +56,4 @@ 
        layout="@layout/qs_customize_panel"

        android:visibility="gone" />



    <ImageView

        android:id="@+id/qs_drag_handle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:layout_marginTop="24dp"

        android:elevation="4dp"

        android:importantForAccessibility="no"

        android:scaleType="center"

        android:src="@drawable/ic_qs_drag_handle"

        android:tint="@color/qs_detail_button_white"

        tools:ignore="UseAppTint" />



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

packages/SystemUI/res/values-sw600dp-land/config.xml

+5 −2
Original line number Diff line number Diff line
@@ -18,11 +18,14 @@ 
    <!-- Max number of columns for quick controls area -->

    <integer name="controls_max_columns">2</integer>



    <!-- The maximum number of rows in the QSPanel -->

    <integer name="quick_settings_max_rows">3</integer>



    <!-- The maximum number of rows in the QuickQSPanel -->

    <integer name="quick_qs_panel_max_rows">4</integer>

    <integer name="quick_qs_panel_max_rows">3</integer>



    <!-- The maximum number of tiles in the QuickQSPanel -->

    <integer name="quick_qs_panel_max_tiles">8</integer>

    <integer name="quick_qs_panel_max_tiles">6</integer>



    <!-- Whether to use the split 2-column notification shade -->

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

packages/SystemUI/res/values-sw720dp-land/config.xml

+5 −2
Original line number Diff line number Diff line
@@ -18,11 +18,14 @@ 
    <!-- Max number of columns for quick controls area -->

    <integer name="controls_max_columns">2</integer>



    <!-- The maximum number of rows in the QSPanel -->

    <integer name="quick_settings_max_rows">3</integer>



    <!-- The maximum number of rows in the QuickQSPanel -->

    <integer name="quick_qs_panel_max_rows">4</integer>

    <integer name="quick_qs_panel_max_rows">3</integer>



    <!-- The maximum number of tiles in the QuickQSPanel -->

    <integer name="quick_qs_panel_max_tiles">8</integer>

    <integer name="quick_qs_panel_max_tiles">6</integer>



    <!-- Whether to use the split 2-column notification shade -->

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

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

+10 −0
Original line number Diff line number Diff line
@@ -109,6 +109,16 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
        mPageToRestore = savedInstanceState.getInt(CURRENT_PAGE, -1);

    }



    @Override

    public int getTilesHeight() {

        // Use the first page as that is the maximum height we need to show.

        TileLayout tileLayout = mPages.get(0);

        if (tileLayout == null) {

            return 0;

        }

        return tileLayout.getTilesHeight();

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);