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

am: d637903

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

Change-Id: I3620fc9aa411f499c704f684c4b40844e13ff486
This commit is contained in:
Jason Monk
2016-04-20 14:30:27 +00:00
committed by android-build-merger
3 changed files with 6 additions and 0 deletions

View File

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

View File

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

View File

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