Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d675236 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: d637903f

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

Change-Id: I3620fc9aa411f499c704f684c4b40844e13ff486
parents 02b0a8f4 d637903f

packages/SystemUI/res/values-sw410dp/config.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -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>

packages/SystemUI/res/values/config.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -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>

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -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);