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

Commit cd41fcd0 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Fold in QS overlay resources and set flag to true 

This also consolidates some resources that were size dependent if they
are not needed.

Bug: 185250134
Test: manual
Change-Id: I98002a1b1f29d0bd68af1c6b76f5e4fb21cdb421
parent b4f9164e

packages/SystemUI/res/values-h740dp-port/dimens.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

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

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

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<resources>

    <dimen name="qs_tile_height">106dp</dimen>

    <dimen name="qs_tile_margin_vertical">24dp</dimen>



    <!-- The height of the qs customize header. Should be

         (qs_panel_padding_top (48dp) +  brightness_mirror_height (48dp) + qs_tile_margin_top (18dp)) -

         (Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (12dp))

    -->

    <dimen name="qs_customize_header_min_height">46dp</dimen>

    <dimen name="qs_tile_margin_top">18dp</dimen>

</resources>
 
 No newline at end of file

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

+2 −3
Original line number Diff line number Diff line
@@ -20,12 +20,11 @@ 
<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources>

    <!-- The maximum number of tiles in the QuickQSPanel -->

    <integer name="quick_qs_panel_max_columns">6</integer>



    <!-- The maximum number of rows in the QuickSettings -->

    <integer name="quick_settings_max_rows">2</integer>



    <integer name="quick_settings_num_columns">4</integer>



    <!-- The number of columns that the top level tiles span in the QuickSettings -->

    <integer name="quick_settings_user_time_settings_tile_span">2</integer>

packages/SystemUI/res/values-land/dimens.xml

+6 −2
Original line number Diff line number Diff line
@@ -23,12 +23,16 @@ 
    <dimen name="docked_divider_handle_height">16dp</dimen>



    <dimen name="qs_tile_margin_top">8dp</dimen>

    <dimen name="qs_tile_margin_vertical">0dp</dimen>



    <!-- The height of the qs customize header. Should be

    (qs_panel_padding_top (48dp) +  brightness_mirror_height (48dp) + qs_tile_margin_top (8dp)) -

    (Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (4dp))

    -->

    <dimen name="qs_customize_header_min_height">44dp</dimen>



    <dimen name="battery_detail_graph_space_top">9dp</dimen>

    <dimen name="battery_detail_graph_space_bottom">9dp</dimen>



    <integer name="quick_settings_num_columns">4</integer>

    <dimen name="qs_detail_margin_top">0dp</dimen>



    <dimen name="volume_tool_tip_right_margin">136dp</dimen>

packages/SystemUI/res/values-sw600dp-land/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
  ~ limitations under the License

  -->

<resources>

    <integer name="quick_settings_num_columns">3</integer>



    <!-- Max number of columns for quick controls area -->

    <integer name="controls_max_columns">2</integer>

packages/SystemUI/res/values-sw600dp-land/dimens.xml

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (c) 2012, The Android Open Source Project

 *

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

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

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

*/

-->

<resources>

    <dimen name="keyguard_clock_notifications_margin">36dp</dimen>



    <dimen name="keyguard_indication_margin_bottom">80dp</dimen>



    <!-- Screen pinning request width (just a little bit bigger than the three buttons here -->

    <dimen name="screen_pinning_request_width">490dp</dimen>

    <!-- Screen pinning request bottom button circle widths -->

    <dimen name="screen_pinning_request_button_width">162dp</dimen>

    <!-- Screen pinning request, controls padding on bigger screens, bigger nav bar -->

    <dimen name="screen_pinning_request_frame_padding">39dp</dimen>

    <!-- Screen pinning request side views to match nav bar

         In sw600dp we want the buttons centered so this fills the space,

         (screen_pinning_request_width - 3 * screen_pinning_request_button_width) / 2 -->

    <dimen name="screen_pinning_request_side_width">2dp</dimen>



    <dimen name="navigation_key_width">162dp</dimen>

    <dimen name="navigation_key_padding">42dp</dimen>



    <dimen name="battery_detail_graph_space_top">27dp</dimen>

    <dimen name="battery_detail_graph_space_bottom">27dp</dimen>



    <dimen name="qs_tile_margin_top">32dp</dimen>

    <dimen name="qs_brightness_padding_top">6dp</dimen>

    <dimen name="qs_detail_margin_top">28dp</dimen>



    <!-- In split shade mode notifications should be aligned to QS header so the value should be

     adjusted to qs header height and height of centered content inside of it:

    (quick_qs_offset_height (48dp) - ongoing_appops_chip_height (24dp) ) / 2 -->

    <dimen name="notifications_top_padding_split_shade">12dp</dimen>

</resources>