summaryrefslogtreecommitdiff
path: root/core/java/android/view/WindowManager.java
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-01-21 14:36:43 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-21 14:36:43 -0800
commit8a82de2fcae11a2a9cba25132c37cad83ccc859f (patch)
tree23822c2bbf065371368cc665cdf1d964d4e993a6 /core/java/android/view/WindowManager.java
parented0c705f3e5879d20c6e6f0ae45529755f8636e0 (diff)
parent4bb180d62f71658d04a7d6800707de83c10b01a5 (diff)
am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
* commit '4bb180d62f71658d04a7d6800707de83c10b01a5': frameworks/base: remove redundant code in WindowManager
Diffstat (limited to 'core/java/android/view/WindowManager.java')
-rw-r--r--core/java/android/view/WindowManager.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 8eb42690229c..c985358fc44b 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1137,14 +1137,6 @@ public interface WindowManager extends ViewManager {
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;