diff options
| author | 2019-05-30 21:12:48 -0700 | |
|---|---|---|
| committer | 2019-05-30 21:12:48 -0700 | |
| commit | f6ab3eae992260d44cd0deca14eb3cc3e072758a (patch) | |
| tree | a2688cf23a7a6fec6dbf2906ea73551101af3fda | |
| parent | 2ce419949b759df5b84d98d58c987bc437d9a46f (diff) | |
| parent | 74ab46629ef0e4631cdd40098003221090a3d994 (diff) | |
Merge "Ensure margins for floating rotation button account for corner insets" into qt-dev am: 64fc46315f
am: 74ab46629e
Change-Id: I9015cd7e204bf0c4bbd670591312abbffb300745
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index c04d28a6cda8..c5e4662f6d45 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -57,7 +57,7 @@ <item name="navigation_luminance_change_threshold" type="dimen" format="float">0.05</item> <dimen name="floating_rotation_button_diameter">40dp</dimen> - <dimen name="floating_rotation_button_margin">4dp</dimen> + <dimen name="floating_rotation_button_min_margin">4dp</dimen> <!-- Height of notification icons in the status bar --> <dimen name="status_bar_icon_size">@*android:dimen/status_bar_icon_size</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java index a79b6251a3d0..a4965ba59c6a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java @@ -51,9 +51,10 @@ public class FloatingRotationButton implements RotationButton { R.layout.rotate_suggestion, null); mKeyButtonView.setVisibility(View.VISIBLE); - Resources resources = mContext.getResources(); - mDiameter = resources.getDimensionPixelSize(R.dimen.floating_rotation_button_diameter); - mMargin = resources.getDimensionPixelSize(R.dimen.floating_rotation_button_margin); + Resources res = mContext.getResources(); + mDiameter = res.getDimensionPixelSize(R.dimen.floating_rotation_button_diameter); + mMargin = Math.max(res.getDimensionPixelSize(R.dimen.floating_rotation_button_min_margin), + res.getDimensionPixelSize(R.dimen.rounded_corner_content_padding)); } @Override |