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

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

Browse Source 
* commit 'ed5cc0e1f7648962f5c93e1277d282be75bcd537':
  revert I057b7ac0 now that the layouts are the expected height.
This commit is contained in:
Chris Wren
2012-06-21 12:03:43 -07:00
committed by Android Git Automerger
parent 63d842cc4d ed5cc0e1f7
commit 70a7be0799
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/widget/SizeAdaptiveLayout.java
View File

@@ -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");

6
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -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);
}