Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidates config_windowOutsetBottom and circular_display_mask_offset

Browse Source 
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
This commit is contained in:
Ching Tzung Lin
2015-10-23 13:07:30 -07:00
parent 910e447d96
commit f6e4c9da5f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/dimens.xml
View File

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

4
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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);