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

Commit 4a066c5c authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Update SystemUI for sw600dp devices. 

Devices between 600 and 719dp will now use the two-bar
(phone) SystemUI layout, or something like it, derived from
PhoneStatusBar. Devices above 720dp will use the system bar
from TabletStatusBar.

However, this distinction is not to be made based on dp, at
least, not by the SystemUI; the goal is to drive most of
this switch from the window manager. Therefore most of
SystemUI's sw600dp resources have been folded into the main
set of resources (renaming them to avoid collisions where
appropriate). This allows SystemUI to choose which set of
resources to use entirely by switching status bar
components, entirely independent of Configuration.

(For some resources, particularly around recents, it seemed
more expeditious to keep relying on the device
configuration, so those resources have been bumped up to
sw720dp.)

Bug: 6297838
Change-Id: I3f5414a6a718bdc83f51930d6878cdf97df48c9c
parent 8b0af627

core/res/res/values-large/dimens.xml

+0 −7
Original line number Original line Diff line number Diff line
@@ -17,13 +17,6 @@ 
*/

*/

-->

-->

<resources>

<resources>

    <!-- Height of the status bar -->

    <dimen name="status_bar_height">48dip</dimen>

    <!-- Width and height of a single notification icon in the status bar -->

    <dimen name="status_bar_icon_size">32dip</dimen>

    <!-- Size of the giant number (unread count) in the notifications -->

    <dimen name="status_bar_content_number_size">48sp</dimen>



    <!-- Default height of a key in the password keyboard for alpha -->

    <!-- Default height of a key in the password keyboard for alpha -->

    <dimen name="password_keyboard_key_height_alpha">75dip</dimen>

    <dimen name="password_keyboard_key_height_alpha">75dip</dimen>

    <!-- Default height of a key in the password keyboard for numeric -->

    <!-- Default height of a key in the password keyboard for numeric -->

core/res/res/values-sw600dp/dimens.xml

+3 −7
Original line number Original line Diff line number Diff line
@@ -18,13 +18,6 @@ 
*/

*/

-->

-->

<resources>

<resources>

    <!-- Height of the status bar -->

    <dimen name="status_bar_height">48dip</dimen>

    <!-- Width and height of a single notification icon in the status bar -->

    <dimen name="status_bar_icon_size">24dip</dimen>

    <!-- Size of the giant number (unread count) in the notifications -->

    <dimen name="status_bar_content_number_size">48sp</dimen>



    <!-- The maximum number of action buttons that should be permitted within

    <!-- The maximum number of action buttons that should be permitted within

         an action bar/action mode. This will be used to determine how many

         an action bar/action mode. This will be used to determine how many

         showAsAction="ifRoom" items can fit. "always" items can override this. -->

         showAsAction="ifRoom" items can fit. "always" items can override this. -->
@@ -82,5 +75,8 @@ 
         (the screen is in landscape). This may be either a fraction or a dimension.-->

         (the screen is in landscape). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_height_minor">90%</item>

    <item type="dimen" name="dialog_fixed_height_minor">90%</item>





    <!-- Height of the bottom navigation bar in portrait; on sw600dp devices

         this is a bit taller -->

    <dimen name="navigation_bar_height_portrait">56dp</dimen>

</resources>

</resources>

packages/SystemUI/res/values-sw600dp/config.xml→core/res/res/values-sw720dp/dimens.xml

+7 −10
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!--

/*

**

** Copyright 2011, The Android Open Source Project

** Copyright 2012, The Android Open Source Project

**

**

** Licensed under the Apache License, Version 2.0 (the "License");

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** you may not use this file except in compliance with the License.
@@ -16,13 +16,10 @@ 
** limitations under the License.

** limitations under the License.

*/

*/

-->

-->



<resources>

<resources>

    <!-- Whether we're using the tablet-optimized recents interface (we use this

    <!-- Height of the bottom navigation bar in portrait; on sw720dp devices

     value at runtime for some things) -->

         this is the same as the height in landscape -->

    <bool name="config_recents_interface_for_tablets">true</bool>

    <dimen name="navigation_bar_height_portrait">@dimen/navigation_bar_height</dimen>



    <!-- Whether recents thumbnails should stretch in both x and y to fill their

     ImageView -->

    <bool name="config_recents_thumbnail_image_fits_to_xy">true</bool>

</resources>

</resources>