diff options
| author | Ching Tzung Lin <ctlin@google.com> | 2015-10-23 13:07:30 -0700 |
|---|---|---|
| committer | Ching Tzung Lin <ctlin@google.com> | 2015-10-23 15:49:52 -0700 |
| commit | f6e4c9da5f70604452a28cd308c3b0e4e47f7075 (patch) | |
| tree | a949d9ede1cbd78ffdba0d8f45946294384c13bd /services | |
| parent | 910e447d96732ad22582efb6cea08925dc21e55c (diff) | |
| download | frameworks_base-f6e4c9da5f70604452a28cd308c3b0e4e47f7075.zip frameworks_base-f6e4c9da5f70604452a28cd308c3b0e4e47f7075.tar.gz frameworks_base-f6e4c9da5f70604452a28cd308c3b0e4e47f7075.tar.bz2 | |
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
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 69ba724..d4e51b2 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); |