Merge change Iafbeb31b into eclair-mr2
* changes:
Maybe really fix windows build.
diff --git a/api/current.xml b/api/current.xml
index af9c67d..80ef3df 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -3463,6 +3463,17 @@
visibility="public"
>
</field>
+<field name="expandableListViewWhiteStyle"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843446"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="exported"
type="int"
transient="false"
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 68661ae..0b605ed 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -340,6 +340,8 @@
<attr name="editTextStyle" format="reference" />
<!-- Default ExpandableListView style. -->
<attr name="expandableListViewStyle" format="reference" />
+ <!-- ExpandableListView with white background. -->
+ <attr name="expandableListViewWhiteStyle" format="reference" />
<!-- Default Gallery style. -->
<attr name="galleryStyle" format="reference" />
<!-- Default GestureOverlayView style. -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 311930a..80d1cea 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1214,5 +1214,13 @@
<public type="attr" name="author" id="0x010102b4" />
<public type="attr" name="autoStart" id="0x010102b5" />
-
+
+
+<!-- ===============================================================
+ Resources added in version 8 of the platform (Eclair MR2).
+ =============================================================== -->
+ <eat-comment />
+
+ <public type="attr" name="expandableListViewWhiteStyle" id="0x010102b6" />
+
</resources>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index c95ede7..b155769 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -401,6 +401,10 @@
<item name="android:childDivider">@android:drawable/divider_horizontal_dark_opaque</item>
</style>
+ <style name="Widget.ExpandableListView.White">
+ <item name="android:childDivider">@android:drawable/divider_horizontal_bright_opaque</item>
+ </style>
+
<style name="Widget.ImageWell">
<item name="android:background">@android:drawable/panel_picture_frame_background</item>
</style>
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 17ea66a..d7a3be3 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -142,6 +142,7 @@
<item name="dropDownListViewStyle">@android:style/Widget.ListView.DropDown</item>
<item name="editTextStyle">@android:style/Widget.EditText</item>
<item name="expandableListViewStyle">@android:style/Widget.ExpandableListView</item>
+ <item name="expandableListViewWhiteStyle">@android:style/Widget.ExpandableListView.White</item>
<item name="galleryStyle">@android:style/Widget.Gallery</item>
<item name="gestureOverlayViewStyle">@android:style/Widget.GestureOverlayView</item>
<item name="gridViewStyle">@android:style/Widget.GridView</item>
@@ -241,6 +242,7 @@
<item name="textCheckMarkInverse">@android:drawable/indicator_check_mark_dark</item>
<item name="gestureOverlayViewStyle">@android:style/Widget.GestureOverlayView.White</item>
+ <item name="expandableListViewStyle">@android:style/Widget.ExpandableListView.White</item>
<item name="listViewStyle">@android:style/Widget.ListView.White</item>
<item name="listDivider">@drawable/divider_horizontal_bright</item>
<item name="listSeparatorTextViewStyle">@android:style/Widget.TextView.ListSeparator.White</item>
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index df011a2..1a86b25 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -6012,7 +6012,9 @@
if (res != null && returnWhat == RETURN_PENDING_POINTER) {
synchronized (mWindowMap) {
- if (mWallpaperTarget == win || mSendingPointersToWallpaper) {
+ if ((mWallpaperTarget == win &&
+ win.mAttrs.type != WindowManager.LayoutParams.TYPE_KEYGUARD)
+ || mSendingPointersToWallpaper) {
sendPointerToWallpaperLocked(win, res, res.getEventTime());
}
}