Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure margins for floating rotation button account for corner insets" into qt-dev

Browse Source
This commit is contained in:
Winson Chung
2019-05-31 03:41:33 +00:00
committed by Android (Google) Code Review
parent f3825f11a1 082e8dfb06
commit 64fc46315f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -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>

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java
View File

@@ -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