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

am 4703273e: Merge "Layout layers without intrinsic dimensions using FILL gravity" into mnc-dev

Browse Source 
* commit '4703273e400981e9ec1bca7e9fbf949b20e91d57':
  Layout layers without intrinsic dimensions using FILL gravity
This commit is contained in:
Alan Viverette
2015-04-29 01:41:28 +00:00
committed by Android Git Automerger
parent 1ac9018ac3 4703273e40
commit b328bfb1bb
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/java/android/graphics/drawable/LayerDrawable.java
View File

@@ -1464,7 +1464,8 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
bounds.right - insetR - padR, bounds.bottom - r.mInsetB - padB); bounds.right - insetR - padR, bounds.bottom - r.mInsetB - padB);
// Apply resolved gravity to drawable based on resolved size. // Apply resolved gravity to drawable based on resolved size.
final int gravity = resolveGravity(r.mGravity, r.mWidth, r.mHeight); final int gravity = resolveGravity(r.mGravity, r.mWidth, r.mHeight,
d.getIntrinsicWidth(), d.getIntrinsicHeight());
final int w = r.mWidth < 0 ? d.getIntrinsicWidth() : r.mWidth; final int w = r.mWidth < 0 ? d.getIntrinsicWidth() : r.mWidth;
final int h = r.mHeight < 0 ? d.getIntrinsicHeight() : r.mHeight; final int h = r.mHeight < 0 ? d.getIntrinsicHeight() : r.mHeight;
Gravity.apply(gravity, w, h, container, outRect, layoutDirection); Gravity.apply(gravity, w, h, container, outRect, layoutDirection);
@@ -1491,7 +1492,8 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
* @param height height of the layer if set, -1 otherwise * @param height height of the layer if set, -1 otherwise
* @return the default gravity for the layer * @return the default gravity for the layer
*/ */
private static int resolveGravity(int gravity, int width, int height) { private static int resolveGravity(int gravity, int width, int height,
int intrinsicWidth, int intrinsicHeight) {
if (!Gravity.isHorizontal(gravity)) { if (!Gravity.isHorizontal(gravity)) {
if (width < 0) { if (width < 0) {
gravity |= Gravity.FILL_HORIZONTAL; gravity |= Gravity.FILL_HORIZONTAL;
@@ -1508,6 +1510,17 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
} }
} }
// If a dimension if not specified, either implicitly or explicitly,
// force FILL for that dimension's gravity. This ensures that colors
// are handled correctly and ensures backward compatibility.
if (width < 0 && intrinsicWidth < 0) {
gravity |= Gravity.FILL_HORIZONTAL;
}
if (height < 0 && intrinsicHeight < 0) {
gravity |= Gravity.FILL_VERTICAL;
}
return gravity; return gravity;
} }