24508 Commits

Author SHA1 Message Date
Fabrice Di Meglio
067bb3b443 Merge "Update TextLayout logging" 2011-08-19 14:39:15 -07:00
Amith Yamasani
1629618098 Merge "Fix an unintentional change in method signature and avoid an API change." 2011-08-19 14:29:34 -07:00
Amith Yamasani
a465b2d4c3 Fix an unintentional change in method signature and avoid an API change.
Change onDetachedFromWindow() override to a protected method, like superclass.

Change-Id: If626c5187290516d525cab5a76f5c5cabe2d87f0
2011-08-19 13:01:22 -07:00
Eino-Ville Talvala
d06fa51b3e Merge "Make changing white-balance mode always disable AWB lock." 2011-08-19 12:42:06 -07:00
Adam Powell
b7d34e7172 Merge "Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items" 2011-08-19 12:34:28 -07:00
Justin Ho
d4f6025702 Merge "Remove old spinner_ assets from zygote Bug: 5076695" 2011-08-19 12:24:06 -07:00
Adam Powell
bfcdfaf919 Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items
Fix a bug where action menus were not updating after configuration
changes.

Change-Id: Iaeed7d924a7b8b40849fd8e1826ed1c8f4079c94
2011-08-19 12:18:13 -07:00
Justin Ho
d5e4e0a112 Merge "Updated overscroll asset Bug: 5076695" 2011-08-19 12:14:30 -07:00
Justin Ho
13684c3523 Remove old spinner_ assets from zygote
Bug: 5076695

Change-Id: I1dddea226dc1701936e4c9dcc05c6b9d2d3c4db6
2011-08-19 12:13:06 -07:00
Amith Yamasani
7c670365ae Merge "Dismiss the volume overlay dialog when user touches above the dialog as well." 2011-08-19 11:17:48 -07:00
Adam Powell
82f24e82e1 Fix bug 5186341 - Double Action bar when displayOptions is 0
What does it mean??

Change-Id: I7978b8fb6877da6178f8db89ec085f1402acf743
2011-08-18 20:16:51 -07:00
Adam Powell
2f5485587b Merge "Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if called before onResume()" 2011-08-18 18:10:03 -07:00
Dianne Hackborn
937ffc174c Merge "Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked" 2011-08-18 18:05:19 -07:00
Fabrice Di Meglio
abb0f299fd Update TextLayout logging
- centralize logging into TextLayoutCache
- add offset logging

Change-Id: I52f229b2a8aed121715b37a5a42936875b23f3c9
2011-08-18 17:59:29 -07:00
Amith Yamasani
baf6dbfa93 Dismiss the volume overlay dialog when user touches above the dialog as well.
Bug: 5165168
Change-Id: Ib343c3b88371cb93f8241b1085d1a2f36a77b1ac
2011-08-18 17:40:29 -07:00
Christopher Tate
eeb2214213 Merge "Stop leaking DeathRecipient and BinderProxy instances" 2011-08-18 17:19:53 -07:00
Christopher Tate
86284c60b5 Stop leaking DeathRecipient and BinderProxy instances
The native-side death recipient object holds a global reference
to the DVM-side DeathRecipient instance.  This is necessary so
that the DeathRecipient isn't GC'd early in the case when the
caller of linkToDeath() doesn't retain their own reference to
the recipient instance.

However, that global reference was never being released in
association with the delivery of the actual binderDied() event.
In that case, if the death recipient did not explicitly call
unlinkToDeath() themselves, the hard global reference was
maintained and a hard-reference cycle was perpetuated, crossing
the native <-> DVM boundary.  This was visible as a gradual
leakage of DVM-side DeathRecipient and BinderProxy instances.

The one problematic constraint is that it needs to be valid to
call unlinkToDeath() cleanly *after* binderDied() is delivered
to the given recipient; that requires that we have the hard reference
linkage described above.  The fix is to replace the hard global
reference with a weak reference to the DVM-side DeathRecipient
after we deliver binderDied() to that recipient.  In the case
where the caller has retained their own reference to the instance
(i.e. they might still call unlinkToDeath() on it later), the
weak reference stays live and everything works cleanly (and is
reaped explicitly by unlinkToDeath() as usual).  In the case where
the caller has *not* retained the instance to call unlinkToDeath()
themselves, demoting to a weak DeathRecipient reference allows
the DeathRecipient to be GC'd, which in turn frees the DVM-side
BinderProxy it's tied to, and so on around the chain to free
all of the associated allocations.

Fixes bug 5174537

Change-Id: Ia4ad76e667140cc2a1b74508bbba652ab31ab876
2011-08-18 17:06:31 -07:00
Adam Powell
993a63abb9 Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if
called before onResume()

Change-Id: I2c21f2bfb3314426d9dfd3b874f593f375c7838a
2011-08-18 16:35:53 -07:00
Adam Powell
931f0b8c07 Merge "Fix bug 5099037 - No delete option when multiple videos are selected" 2011-08-18 16:24:19 -07:00
Adam Powell
23f4cc0353 Fix bug 5099037 - No delete option when multiple videos are selected
Fix some bugs related to how action item slots are allocated in menus.

Fix some padding/margins in ActivityChooserView.

Change-Id: I12096b0165daca902c5bc8e24c1e8d54a35e9557
2011-08-18 16:19:31 -07:00
Dianne Hackborn
d99b293d5f Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked
Change-Id: I069673f2fbdf05e409c5e9ed99ccd1e15b4fe3ed
2011-08-18 16:02:41 -07:00
Nicolas Roard
fc8f2ca621 Merge "Modify nativeSetProperty to return a boolean indicating if we need to invalidate the content or not." 2011-08-18 15:45:27 -07:00
Jeff Sharkey
9a20fa54c9 Merge "Background data notification, API clean up." 2011-08-18 15:01:10 -07:00
Adam Powell
73f2677dc0 Fix bug 5185010 - android:backgroundSplit doesn't accept a color value
Let both backgroundSplit and backgroundStacked take raw color values.

Change-Id: I05035d6b29bf2973b23da2faf2943d56cba7755f
2011-08-18 14:32:11 -07:00
Eino-Ville Talvala
16b67137b8 Make changing white-balance mode always disable AWB lock.
Fixes previously unspecified behavior wrt changing white-balance mode
while AWB is locked.

Change-Id: Ib70597319010cc7e6c88b26cae534ceea4fb46ce
2011-08-18 13:57:49 -07:00
Adam Powell
843c3545d5 Merge "Fix bug 5183775 - Action bar custom layouts with default gravity misbehave" 2011-08-18 13:21:56 -07:00
Jaikumar Ganesh
5293bfa57a am 294539df: am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '294539df2c05eb62c417e25b2e1c8a71474b09e6':
  Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:13:30 -07:00
Jaikumar Ganesh
294539df2c am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '3e9413473f87ad17f3767ffbb0c57046c2db29be':
  Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:10:02 -07:00
Jaikumar Ganesh
3e9413473f am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '6f6b21b407a8883b92b3de9e028e4dc1550b9648':
  Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:08:05 -07:00
Adam Powell
7a2424d041 Fix bug 5183775 - Action bar custom layouts with default gravity misbehave
Change-Id: I314822ed9617d2c1de55e1f3238f1ca8899393f3
2011-08-18 11:59:27 -07:00
Nicolas Roard
872cf224f3 Modify nativeSetProperty to return a boolean indicating if we
need to invalidate the content or not.

corresponding C++ CL: https://android-git.corp.google.com/g/#/c/129130/

bug:5167645
Change-Id: I48a3dd252e2a7ef24f3828e1e2955f86867423dd
2011-08-18 11:53:04 -07:00
Brian Muramatsu
583b163feb Merge "Test for Settings Intent" 2011-08-18 10:57:46 -07:00
Chris Craik
da2f8df48b Merge "Removed setExtendedTileBounds" 2011-08-18 10:56:40 -07:00
Jeff Sharkey
11a8c027e4 Merge "Preferences padding and scrollbars to match spec." 2011-08-18 10:52:03 -07:00
Chris Craik
cb41847901 Removed setExtendedTileBounds
bug:5178457
for real this time
Change-Id: I4f40206d66feb8ddf6fd844e9fe5cce2096317bc
2011-08-18 10:24:16 -07:00
JP Abgrall
0197d825f1 Merge "core/java NetworkManagement: Don't untag sockets willy-nilly" 2011-08-18 09:58:32 -07:00
Wu-cheng Li
fde00591c6 Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE." 2011-08-17 22:24:53 -07:00
Romain Guy
7fa6e42483 Merge "Invoke requestLayout() when drawables have different sizes. Bug #5142668" 2011-08-17 20:06:14 -07:00
Romain Guy
9e648c44de Invoke requestLayout() when drawables have different sizes.
Bug #5142668

Change-Id: I0d3ae27984e69394e64b8aa0623bc3d6b22bc629
2011-08-17 20:05:38 -07:00
Dianne Hackborn
c7e6c47952 Merge "Fix issue #5163456: logspam/tight loop in BatteryStatsImpl" 2011-08-17 19:18:50 -07:00
Dianne Hackborn
e8c88e6f76 Fix issue #5163456: logspam/tight loop in BatteryStatsImpl
No longer use the old history code.

Change-Id: I878ffe16e0014453c46db6a4f7228a81468d8cb9
2011-08-17 19:09:23 -07:00
Chet Haase
4abe2ac244 Merge "Fix potential null deref in ViewGroup when running transition" 2011-08-17 18:38:46 -07:00
Chet Haase
a8a44c68ee Merge "Fix NumberPicker text positioning." 2011-08-17 18:35:07 -07:00
Chet Haase
1abf7fa1d1 Fix potential null deref in ViewGroup when running transition
Change-Id: I9075c4a05e19122592145468e220afa43faee540
2011-08-17 18:31:56 -07:00
Chet Haase
eeafd4296b Fix NumberPicker text positioning.
NumberPicker was making incorrect assumptions about how text was
positioned and centered inside of its controls. This fix changes
the logic of how the scroll wheel draws its text items based on where
the text is positioned inside the EditText that displays the text
by default. This should ensure that the text of the scroll wheel
exactly overlays the text in the EditText view.

Change-Id: I4a7694931f19042bd4142232612490c2ab912d11
2011-08-17 18:26:56 -07:00
Jeff Sharkey
1666dc6041 Merge "Combine list of CharSequence with delimeter." 2011-08-17 18:12:07 -07:00
Brian Muramatsu
fe62e31914 Test for Settings Intent
Bug 4983978

Change-Id: I4d366bbcacdc12e5d86d22f5fab0e934e4ef66db
2011-08-17 18:11:27 -07:00
Adam Powell
2efd89f755 Merge "Fix bug 5179524 - ActionBar custom view inflation doesn't catch layout_gravity" 2011-08-17 17:38:24 -07:00
Adam Powell
aad47fd78a Fix bug 5179524 - ActionBar custom view inflation doesn't catch layout_gravity
Change-Id: Ice5fd9da268cff64fc14acca384b249c252db5c9
2011-08-17 17:33:48 -07:00
Fabrice Di Meglio
3de510313a Merge "Fix bug #5175022 Easy mode in MeasuredText.setPara() is no more used" 2011-08-17 17:30:46 -07:00