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

am: 9d67523

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

Change-Id: I4e90399a94585a05408268611a841679c7ec5123
This commit is contained in:
Jason Monk
2016-04-20 14:36:19 +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);