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

Commit e8fa18f7 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Adjusting margins and paddings for portrait shade on large screens"... 

Merge "Adjusting margins and paddings for portrait shade on large screens" into tm-dev am: 08a6e44c

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

Change-Id: Ie10ec914c7c05606634a59e3282ca60fa447da4d
parents 56f3de3d 08a6e44c

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License.

  -->

<resources>

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

    <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>

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

+4 −1
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ 
     for different hardware and product builds. -->

<resources>

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

    <dimen name="notification_panel_margin_horizontal">120dp</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">90dp</dimen>



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

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

    <dimen name="notification_section_divider_height">16dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
    <!-- Height of a heads up notification in the status bar -->

    <dimen name="notification_max_heads_up_height_increased">188dp</dimen>



    <!-- Side padding on the lockscreen on the side of notifications -->

    <!-- Side padding on the side of notifications -->

    <dimen name="notification_side_paddings">16dp</dimen>



    <!-- padding between the heads up and the statusbar -->

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+0 −4
Original line number Diff line number Diff line
@@ -1233,10 +1233,6 @@ public class NotificationStackScrollLayoutController { 
        mView.forceNoOverlappingRendering(force);

    }



    public void setTranslationX(float translation) {

        mView.setTranslationX(translation);

    }



    public void setExpandingVelocity(float velocity) {

        mView.setExpandingVelocity(velocity);

    }