Merge "Make default status bar padding 8dp" into oc-dr1-dev

This commit is contained in:
TreeHugger Robot
2017-06-22 20:20:39 +00:00
committed by Android (Google) Code Review
2 changed files with 12 additions and 6 deletions

View File

@@ -820,7 +820,7 @@
<dimen name="edge_margin">16dp</dimen>
<dimen name="rounded_corner_radius">0dp</dimen>
<dimen name="rounded_corner_content_padding">0dp</dimen>
<dimen name="rounded_corner_content_padding">8dp</dimen>
<!-- Intended corner radius when drawing the mobile signal -->
<dimen name="stat_sys_mobile_signal_corner_radius">0.75dp</dimen>

View File

@@ -55,11 +55,17 @@ public class RoundedCorners extends SystemUI implements Tunable {
public void start() {
mRoundedDefault = mContext.getResources().getDimensionPixelSize(
R.dimen.rounded_corner_radius);
if (mRoundedDefault == 0) {
// No rounded corners on this device.
return;
if (mRoundedDefault != 0) {
setupRounding();
}
int padding = mContext.getResources().getDimensionPixelSize(
R.dimen.rounded_corner_content_padding);
if (padding != 0) {
setupPadding(padding);
}
}
private void setupRounding() {
mOverlay = LayoutInflater.from(mContext)
.inflate(R.layout.rounded_corners, null);
mOverlay.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
@@ -82,10 +88,10 @@ public class RoundedCorners extends SystemUI implements Tunable {
mDensity = metrics.density;
Dependency.get(TunerService.class).addTunable(this, SIZE);
}
private void setupPadding(int padding) {
// Add some padding to all the content near the edge of the screen.
int padding = mContext.getResources().getDimensionPixelSize(
R.dimen.rounded_corner_content_padding);
StatusBar sb = getComponent(StatusBar.class);
View statusBar = sb.getStatusBarWindow();