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

Commit f6e4c9da authored by Ching Tzung Lin's avatar Ching Tzung Lin
Browse files

Consolidates config_windowOutsetBottom and circular_display_mask_offset 

Three phases involved:
phase 1: change all code references to circurlar_display_mask_offset to
config_windowOutsetBottom, and mark circular_display_mask_offset
deprecated.

phase 2: remove circular_display_mask_offset from device overlays

phase 3: remove circular_display_mask_offset symbol and default setting.

Bug:25220421
Change-Id: Ia3f77610dbbb964eb58c6b28f6206799d56c44c2
parent 910e447d

core/res/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -364,7 +364,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
@@ -5983,8 +5983,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);