commit ded2b00643c788a96ce8adc1a4cc0f7619a4c606
author Brad Fitzpatrick <bradfitz@android.com> Tue Jan 18 12:59:19 2011 -0800
committer Android Code Review <code-review@android.com> Tue Jan 18 12:59:19 2011 -0800
tree b3ae603350f2291944aca4c669a59f11b8191a4f
parent 7d234fabe61cd5f034fe4ff4484209fbf5130c4d
parent 3f6875f143fbaf4de993025f6765dc8237eb2b0b

Merge "frameworks/base: remove redundant code in WindowManager"

core/java/android/view/WindowManager.java

diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 091844e..d6dcd4c 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1050,14 +1050,6 @@
                 gravity = o.gravity;
                 changes |= LAYOUT_CHANGED;
             }
-            if (horizontalMargin != o.horizontalMargin) {
-                horizontalMargin = o.horizontalMargin;
-                changes |= LAYOUT_CHANGED;
-            }
-            if (verticalMargin != o.verticalMargin) {
-                verticalMargin = o.verticalMargin;
-                changes |= LAYOUT_CHANGED;
-            }
             if (format != o.format) {
                 format = o.format;
                 changes |= FORMAT_CHANGED;