Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix QS size on 320dp with big fonts" into oc-dev am: 5667b6ba1d" into oc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-04-24 18:53:45 +00:00
committed by Android (Google) Code Review
parent dbb70d4eb8 45da9d3c55
commit d6b13bc235
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/values-sw410dp/config.xml
View File

@@ -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
packages/SystemUI/res/values/config.xml
View File

@@ -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>

3
packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
View File

@@ -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));
}