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

Commit 5667b6ba authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix QS size on 320dp with big fonts" into oc-dev

parents 58ad9aac 290a4199
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@
     for different hardware and product builds. -->
<resources>
    <integer name="quick_settings_num_rows">2</integer>
    <integer name="quick_settings_num_rows_portrait">3</integer>

    <bool name="quick_settings_show_full_alarm">true</bool>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@

    <!-- The number of rows in the QuickSettings -->
    <integer name="quick_settings_num_rows">1</integer>
    <integer name="quick_settings_num_rows_portrait">2</integer>

    <!-- The number of columns that the top level tiles span in the QuickSettings -->
    <integer name="quick_settings_user_time_settings_tile_span">1</integer>
+1 −2
Original line number Diff line number Diff line
@@ -279,8 +279,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
        private int getRows() {
            final Resources res = getContext().getResources();
            if (res.getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
                // Always have 3 rows in portrait.
                return 3;
                return res.getInteger(R.integer.quick_settings_num_rows_portrait);
            }
            return Math.max(1, res.getInteger(R.integer.quick_settings_num_rows));
        }