diff options
| author | Ching Tzung Lin <ctlin@google.com> | 2015-10-28 17:33:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-28 17:33:03 +0000 |
| commit | c45009906ade7b25b6c01c02113c044bd9290ffb (patch) | |
| tree | 2c0e222b6dd30fc9e103a866a39b075826cf6f83 /core/res | |
| parent | 9aa91f99b26ddac01c7045e1a18b6f0116b4eec7 (diff) | |
| parent | 36da2a208e253d0635bb569cb92ea0e11f489b4e (diff) | |
| download | frameworks_base-c45009906ade7b25b6c01c02113c044bd9290ffb.zip frameworks_base-c45009906ade7b25b6c01c02113c044bd9290ffb.tar.gz frameworks_base-c45009906ade7b25b6c01c02113c044bd9290ffb.tar.bz2 | |
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
am: 36da2a208e
* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/dimens.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 8635a4f..3223940 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> |