diff options
| author | 2015-10-28 17:25:24 +0000 | |
|---|---|---|
| committer | 2015-10-28 17:25:24 +0000 | |
| commit | 36da2a208e253d0635bb569cb92ea0e11f489b4e (patch) | |
| tree | e4ffd68bd2b15f8a1b3edba89e4c4c0cacbea880 | |
| parent | d2b3815dda57702ebbd00a6422d21a52b0604dfa (diff) | |
| parent | f6e4c9da5f70604452a28cd308c3b0e4e47f7075 (diff) | |
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
| -rw-r--r-- | core/res/res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 8635a4fac7bc..3223940692ab 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -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> diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 69ba7241f4a0..d4e51b2c262d 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -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); |