diff options
| author | 2016-04-20 14:21:25 +0000 | |
|---|---|---|
| committer | 2016-04-20 14:21:27 +0000 | |
| commit | d637903fe683bd4cf7403ee69e3d59e55e382c29 (patch) | |
| tree | 2c75a15e8a32b53de957e439d38250d685f40589 | |
| parent | 8095309791e276bec10a731e2b13fe8512cd8e42 (diff) | |
| parent | 85b866d5e434d1c7d8ce3083c9e951c41c343c5b (diff) | |
Merge "Update QS header to handle 320dp without overlapping" into nyc-dev
3 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values-sw410dp/config.xml b/packages/SystemUI/res/values-sw410dp/config.xml index 08b2f8876470..049a5357c6da 100644 --- a/packages/SystemUI/res/values-sw410dp/config.xml +++ b/packages/SystemUI/res/values-sw410dp/config.xml @@ -21,4 +21,6 @@ for different hardware and product builds. --> <resources> <integer name="quick_settings_num_rows">2</integer> + + <bool name="quick_settings_show_date">true</bool> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index c54db378bf67..ef84c76c4c5c 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -268,5 +268,7 @@ <!-- Nav bar button default ordering/layout --> <string name="config_navBarLayout" translatable="false">space,back;home;recent,menu_ime</string> + <bool name="quick_settings_show_date">false</bool> + </resources> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java index 2b03dfb841c3..b8e069d3fe5b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java @@ -106,6 +106,8 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group); mDateTimeGroup.setPivotX(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); |