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

Commit 70a7be07 authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height. 

* commit 'ed5cc0e1':
  revert I057b7ac0 now that the layouts are the expected height.
parents 63d842cc ed5cc0e1

core/java/com/android/internal/widget/SizeAdaptiveLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public class SizeAdaptiveLayout extends ViewGroup { 


    private static final String TAG = "SizeAdaptiveLayout";

    private static final boolean DEBUG = false;

    private static final boolean REPORT_BAD_BOUNDS = true;

    private static final long CROSSFADE_TIME = 250;



    // TypedArray indices
@@ -175,7 +176,7 @@ public class SizeAdaptiveLayout extends ViewGroup { 
            height = Math.min(height, lp.maxHeight);

        }



        if (DEBUG && heightIn != height) {

        if (REPORT_BAD_BOUNDS && heightIn != height) {

            Log.d(TAG, this + "child view " + child + " " +

                  "measured out of bounds at " + heightIn +"px " +

                  "clamped to " + height + "px");

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+3 −3
Original line number Diff line number Diff line
@@ -561,14 +561,14 @@ public abstract class BaseStatusBar extends SystemUI implements 
        if (expandedOneU != null) {

            SizeAdaptiveLayout.LayoutParams params =

                    new SizeAdaptiveLayout.LayoutParams(expandedOneU.getLayoutParams());

            params.minHeight = rowHeight;

            params.maxHeight = rowHeight;

            params.minHeight = minHeight;

            params.maxHeight = minHeight;

            adaptive.addView(expandedOneU, params);

        }

        if (expandedLarge != null) {

            SizeAdaptiveLayout.LayoutParams params =

                    new SizeAdaptiveLayout.LayoutParams(expandedLarge.getLayoutParams());

            params.minHeight = rowHeight+1;

            params.minHeight = minHeight+1;

            params.maxHeight = maxHeight;

            adaptive.addView(expandedLarge, params);

        }