summaryrefslogtreecommitdiff
path: root/core/java/android/view/WindowManagerPolicy.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-31 18:11:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-31 18:11:29 -0700
commit7322e557cfe42da42779625d69ced2db74a9df90 (patch)
tree168cbb98976d6c44a513c3e6a7a3c79957f85fb1 /core/java/android/view/WindowManagerPolicy.java
parent409db558b3f47ac28f1291d82bef15a07b2920c3 (diff)
parenta4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1 (diff)
am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1': Fix issue #4502672: Wrong xml resources used for homescreen widgets.
Diffstat (limited to 'core/java/android/view/WindowManagerPolicy.java')
-rw-r--r--core/java/android/view/WindowManagerPolicy.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index beb23aa45ee3..4d4569c1f3db 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -17,6 +17,7 @@
package android.view;
import android.content.Context;
+import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.os.IBinder;
@@ -537,7 +538,7 @@ public interface WindowManagerPolicy {
* @see #removeStartingWindow
*/
public View addStartingWindow(IBinder appToken, String packageName,
- int theme, CharSequence nonLocalizedLabel,
+ int theme, CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel,
int labelRes, int icon, int windowFlags);
/**