summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-12-15 12:00:37 -0800
committerRomain Guy <romainguy@android.com>2009-12-15 12:00:37 -0800
commit611cd3f4a921e2a170b670a536548e88e861f7de (patch)
treedd71ace4e87914ce9138c85749ba494591dfd083
parente7d35eb56e7c854f1d0ef2320c39f7635de14f8a (diff)
downloadframeworks_base-611cd3f4a921e2a170b670a536548e88e861f7de.zip
frameworks_base-611cd3f4a921e2a170b670a536548e88e861f7de.tar.gz
frameworks_base-611cd3f4a921e2a170b670a536548e88e861f7de.tar.bz2
Fixes layout shifts in LinearLayout.
Bug: 2329142.
-rw-r--r--core/java/android/widget/LinearLayout.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
index 6cc794b..f49079c 100644
--- a/core/java/android/widget/LinearLayout.java
+++ b/core/java/android/widget/LinearLayout.java
@@ -991,6 +991,9 @@ public class LinearLayout extends ViewGroup {
case Gravity.RIGHT:
childLeft = childRight - childWidth - lp.rightMargin;
break;
+ default:
+ childLeft = paddingLeft;
+ break;
}
@@ -1102,6 +1105,9 @@ public class LinearLayout extends ViewGroup {
childTop -= (maxDescent[INDEX_BOTTOM] - descent);
}
break;
+ default:
+ childTop = paddingTop;
+ break;
}
childLeft += lp.leftMargin;