Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb764f81 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Make default status bar padding 8dp" into oc-dr1-dev am: 5af936f3 

am: 1737fcd4

Change-Id: I3a80541dfd78e10b3b9d8c4f45d14cd8741e729f
parents 7fc2e746 1737fcd4

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -819,7 +819,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>

packages/SystemUI/src/com/android/systemui/RoundedCorners.java

+11 −5
Original line number Diff line number Diff line
@@ -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();