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

Merge "Update QS header to handle 320dp without overlapping" into nyc-dev

Browse Source 
am: d637903

* commit 'd637903fe683bd4cf7403ee69e3d59e55e382c29':
  Update QS header to handle 320dp without overlapping

Change-Id: I1fe29681d00767a60e017ba5fc0993b981718a7a
This commit is contained in:
Jason Monk
2016-04-20 14:30:23 +00:00
committed by android-build-merger
parent b62c7fe128 d637903fe6
commit f784dc4003
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,4 +21,6 @@
for different hardware and product builds. --> for different hardware and product builds. -->
<resources> <resources>
<integer name="quick_settings_num_rows">2</integer> <integer name="quick_settings_num_rows">2</integer>
<bool name="quick_settings_show_date">true</bool>
</resources> </resources>

2
packages/SystemUI/res/values/config.xml
View File

@@ -268,5 +268,7 @@
<!-- Nav bar button default ordering/layout --> <!-- Nav bar button default ordering/layout -->
<string name="config_navBarLayout" translatable="false">space,back;home;recent,menu_ime</string> <string name="config_navBarLayout" translatable="false">space,back;home;recent,menu_ime</string>
<bool name="quick_settings_show_date">false</bool>
</resources> </resources>

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
View File

@@ -106,6 +106,8 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group); mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group);
mDateTimeGroup.setPivotX(0); mDateTimeGroup.setPivotX(0);
mDateTimeGroup.setPivotY(0); mDateTimeGroup.setPivotY(0);
boolean showDate = getResources().getBoolean(R.bool.quick_settings_show_date);
findViewById(R.id.date).setVisibility(showDate ? View.VISIBLE : View.GONE);
mExpandIndicator = (ExpandableIndicator) findViewById(R.id.expand_indicator); mExpandIndicator = (ExpandableIndicator) findViewById(R.id.expand_indicator);