From 082e8dfb063bfe7e0dc55a067e365b26fea7206e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 30 May 2019 16:18:00 -0700
Subject: Ensure margins for floating rotation button account for corner insets

Bug: 134070810
Test: On P4, rotate the screen and see the button
Change-Id: I67159e94a3a03e8a580b943d860ad32b1753e160
---
 packages/SystemUI/res/values/dimens.xml                            | 2 +-
 .../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
-- 
cgit v1.2.3-59-g8ed1b