summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-14 19:32:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-14 19:32:39 -0700
commit2da87ec32e72c2c25998e2444155c00074cfbd40 (patch)
tree49dd2b0d98e7b0e451c23c15738a5e4cdf0e24c4 /core/java/com
parent58b0dcde83354bd1ae9091a7cbc7f207fb29960a (diff)
parent2a7a6ca00ab176105b5bbfa6b17bb0dcd058d517 (diff)
downloadframeworks_base-2da87ec32e72c2c25998e2444155c00074cfbd40.zip
frameworks_base-2da87ec32e72c2c25998e2444155c00074cfbd40.tar.gz
frameworks_base-2da87ec32e72c2c25998e2444155c00074cfbd40.tar.bz2
am 2a7a6ca0: Merge "Implement new window cropping." into jb-dev
* commit '2a7a6ca00ab176105b5bbfa6b17bb0dcd058d517': Implement new window cropping.
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/view/BaseIWindow.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/view/BaseIWindow.java b/core/java/com/android/internal/view/BaseIWindow.java
index fbed485..4c34d73 100644
--- a/core/java/com/android/internal/view/BaseIWindow.java
+++ b/core/java/com/android/internal/view/BaseIWindow.java
@@ -33,7 +33,7 @@ public class BaseIWindow extends IWindow.Stub {
mSession = session;
}
- public void resized(int w, int h, Rect systemInsets, Rect contentInsets,
+ public void resized(int w, int h, Rect contentInsets,
Rect visibleInsets, boolean reportDraw, Configuration newConfig) {
if (reportDraw) {
try {