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

Commit 1230f422 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Better support portrait mode for foldables" into tm-qpr-dev am: d54e9888 am: c5d095d1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20352378



Change-Id: Id95f9fbb61698447223520aa9669a37d0e4666bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18fca9d4 c5d095d1

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

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

<!--

  ~ Copyright (C) 2022 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.

  -->



<!-- Intended for wide devices that are currently oriented with a lot of available height,

     such as tablets. 'hxxxdp' is used instead of 'port' in order to avoid this being applied

     to wide devices that are shorter in height, like foldables. -->

<resources>

    <!-- Space between status view and notification shelf -->

    <dimen name="keyguard_status_view_bottom_margin">35dp</dimen>

    <dimen name="keyguard_clock_top_margin">40dp</dimen>

</resources>

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

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
<resources>

    <dimen name="notification_panel_margin_horizontal">48dp</dimen>

    <dimen name="status_view_margin_horizontal">62dp</dimen>

    <dimen name="keyguard_clock_top_margin">40dp</dimen>

    <dimen name="keyguard_status_view_bottom_margin">40dp</dimen>

    <dimen name="bouncer_user_switcher_y_trans">20dp</dimen>



    <!-- qs_tiles_page_horizontal_margin should be margin / 2, otherwise full space between two

packages/SystemUI/res/values-sw720dp-h1000dp/dimens.xml

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

<!--

  ~ Copyright (C) 2022 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.

  -->

<!-- Intended for wide devices that are currently oriented with a lot of available height,

     such as tablets. 'hxxxdp' is used instead of 'port' in order to avoid this being applied

     to wide devices that are shorter in height, like foldables. -->

<resources>

    <!-- Space between status view and notification shelf -->

    <dimen name="keyguard_status_view_bottom_margin">70dp</dimen>

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

</resources>

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

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
     for different hardware and product builds. -->

<resources>

    <dimen name="status_view_margin_horizontal">124dp</dimen>

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

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

    <dimen name="bouncer_user_switcher_y_trans">200dp</dimen>



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