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

Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev

Browse Source 
am: 36da2a208e

* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
This commit is contained in:
Ching Tzung Lin
2015-10-28 17:33:03 +00:00
committed by android-build-merger
parent 9aa91f99b2 36da2a208e
commit c45009906a
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);