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

Commit e29953c1 authored by Ching Tzung Lin's avatar Ching Tzung Lin Committed by android-build-merger
Browse files

Merge "Consolidates config_windowOutsetBottom and... 

Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a20 am: c4500990
am: a05beb29

* commit 'a05beb29':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
parents 346b38cd a05beb29

core/res/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -367,7 +367,8 @@ 


    <dimen name="resolver_max_width">480dp</dimen>



    <!-- Size of the offset applied to the position of the circular mask. This

    <!-- @deprecated Use config_windowOutsetBottom instead.

         Size of the offset applied to the position of the circular mask. This

         is only used on circular displays. In the case where there is no

         "chin", this will default to 0 -->

    <dimen name="circular_display_mask_offset">0px</dimen>

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -5438,8 +5438,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                if (visible) {

                    // TODO(multi-display): support multiple displays

                    if (mCircularDisplayMask == null) {

                        int screenOffset = mContext.getResources().getDimensionPixelSize(

                                com.android.internal.R.dimen.circular_display_mask_offset);

                        int screenOffset = mContext.getResources().getInteger(

                                com.android.internal.R.integer.config_windowOutsetBottom);

                        int maskThickness = mContext.getResources().getDimensionPixelSize(

                                com.android.internal.R.dimen.circular_display_mask_thickness);