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

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

Merge "3 column QS" into sc-v2-dev

parents 5b3dce27 35342722

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

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

<!--

  ~ 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

  -->

<resources>



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

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



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

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



    <!-- The number of columns in the QuickSettings -->

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

</resources>

packages/SystemUI/res/values-sw600dp-port/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

<resources>

    <!-- Size of the panel of large phones on portrait. This shouldn't fill, but have some padding on the side -->

    <dimen name="notification_panel_width">416dp</dimen>

    <dimen name="notification_panel_width">504dp</dimen>



</resources>

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

+9 −0
Original line number Diff line number Diff line
@@ -22,5 +22,14 @@ 
<resources>

    <integer name="status_bar_config_maxNotificationIcons">5</integer>



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

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



    <!-- The number of columns in the QuickSettings -->

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



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

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



</resources>

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

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
        super.onConfigurationChanged(newConfig);

        if (mLayoutOrientation != newConfig.orientation) {

            mLayoutOrientation = newConfig.orientation;

            mDistributeTiles = true;

            setCurrentItem(0, false);

            mPageToRestore = 0;

        }