25477 Commits

Author SHA1 Message Date
Ben Murdoch
e0b0578a1e Merge "Force a WebView pictureset invalidation on screen rotation." 2011-09-26 06:19:56 -07:00
Jeff Sharkey
61c0818f24 Merge "Watch network subtype, tethering teardown, empty." 2011-09-25 23:44:10 -07:00
Adam Powell
83131db9a8 Merge "Fix bug 5358705 - Request no full-screen mode of the IME when a SearchView is expanded in an action bar" 2011-09-25 14:45:59 -07:00
Bart Sears
c52feae948 Merge "Revert "Transfer large bitmaps using ashmem. Bug: 5224703"" 2011-09-25 14:32:14 -07:00
Bart Sears
b637717096 Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
This reverts commit 56c58f66b97d22fe7e7de1f7d9548bcbe1973029

This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
2011-09-25 14:30:21 -07:00
Adam Powell
53f56c4f51 Fix bug 5358705 - Request no full-screen mode of the IME when a
SearchView is expanded in an action bar

This is a case where we always know there will be room on screen for
the user to meaningfully use the UI in the absence of full-screen
extract mode. Save the old state and restore it when we go in and out
of expanded action bar mode.

Change-Id: I4ae2c5df4f581c6824e6a1f7ff8d97fd86d8e260
2011-09-25 13:50:57 -07:00
Jeff Brown
4113acf10a Merge "Transfer large bitmaps using ashmem. Bug: 5224703" 2011-09-24 20:49:20 -07:00
Brandon Keely
296296caf6 Merge "Avoid double-ping when tapping outside the handle." 2011-09-24 15:16:54 -07:00
Jeff Brown
56c58f66b9 Transfer large bitmaps using ashmem.
Bug: 5224703

Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
2011-09-23 21:20:47 -07:00
Brandon Keely
72ec81441a Avoid double-ping when tapping outside the handle.
Change-Id: Iccab649e075fc86a860c1ce6e8df173e9968bef2
2011-09-23 18:47:00 -07:00
Jeff Brown
4c253119db Merge "Prevent unintended rotations. Bug: 4981385" 2011-09-23 18:28:01 -07:00
Adam Powell
275702c2f4 Fix bug 5355889 - Search action showing up in the menu dropdown in
spite of search actionview being expanded

Make sure that menu items with an expanded action view don't show up
in list menus presenting the rest of the menu.

Change-Id: I8c7b4e184a9d3ea2457543d0b8b36bc8e7068052
2011-09-23 17:36:15 -07:00
Jeff Brown
c0347aa19f Prevent unintended rotations.
Bug: 4981385

Changed the orientation listener to notify the policy whenever
its proposed orientation changes, and changes the window manager
to notify the orientation listener when the actual orientation
changes.  This allows us to better handle the case where the
policy has rejected a given proposal at one time (because the
current application forced orientation) but might choose
to accept the same proposal at another time.

It's important that the proposal always be up to date.  A proposal
becomes irrelevant as soon as the phone posture changes such
that we can no longer determine the orientation with confidence
(such as when a device is placed flat on a table).

Simplified the orientation filtering.  Now we just wait 200ms
for the device to be still before issuing a proposal.  The idea
is that if the device is moving around a lot, we assume that
the device is being picked up or put down or otherwise in
the process of being moved.  We don't want to change the rotation
until that's all settled down.  However, we do want to tolerate
a certain amount of environmental noise.

(The previous confidence algorithm was also designed along
these lines but it was less direct about waiting for things
to settle.  Instead it simply made orientation changes take
longer than usual while unsettled, but the extra delay was often
too much or too little.  This one should be easier to tune.)

Change-Id: I09e6befea1f0994b6b15d424f3182859c0d9a530
2011-09-23 17:26:09 -07:00
Eric Fischer
bcbe34c7a4 am b8c78262: Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
* commit 'b8c7826264816492ff91a27b1eb2d0d1454053e1':
  Mark MCC locale replacement strings not translatable.
2011-09-23 15:46:56 -07:00
Eric Fischer
b8c7826264 Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom 2011-09-23 15:45:27 -07:00
Eric Fischer
90bf476588 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-23 15:37:46 -07:00
Eric Fischer
9bb4a78190 Mark MCC locale replacement strings not translatable.
Change-Id: Icc7a7a3b8c6c7c606fbb5c00dcf9292d9dc3de1c
2011-09-23 15:35:11 -07:00
Eric Fischer
a94fd2f05e Import revised translations. DO NOT MERGE
Change-Id: I1c2a959cd127faec64c01523fdec3baf43e8d7ab
2011-09-23 15:21:30 -07:00
Irfan Sheriff
15bbaeb075 am c21994bc: Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
* commit 'c21994bc26df959d1a7161e38b4402b7255ea321':
  Fix watchdog to stop ping after wifi disconnects
2011-09-23 15:20:56 -07:00
Irfan Sheriff
c21994bc26 Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom 2011-09-23 15:18:37 -07:00
Fabrice Di Meglio
ba7bc59101 Merge "Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height" 2011-09-23 15:18:37 -07:00
Adam Powell
6ed1bfb1b6 Merge "Fix bug 5341139 - bottom bar stays if app wants to handle orientation change" 2011-09-23 15:06:30 -07:00
Dianne Hackborn
a982ad19d2 Merge "Fix issue #5173952: Opening a Notification From Lock Screen..." 2011-09-23 14:54:26 -07:00
John Reck
6c984bcb17 Merge "Add detail to restorePicture deprecation" 2011-09-23 14:48:52 -07:00
Irfan Sheriff
32f04e9009 Fix watchdog to stop ping after wifi disconnects
- The pings are delayed async messages that were getting handled
after a disconnect as well

- Increase poll time to 200 ms, so we block on a receive for 1ms every 200ms for a
sent packet

Bug: 5361564
Change-Id: I1931a1c4146e78a87407d541d8c3934ff8232604
2011-09-23 14:48:26 -07:00
Adam Powell
a05aba9c50 Fix bug 5341139 - bottom bar stays if app wants to handle orientation
change

Let action bars move between split/unsplit mode on configuration
changes if set to split when narrow.

Change-Id: I13f5115a65247cb1878ee823493ca8e2b6ba4cf6
2011-09-23 14:23:30 -07:00
Fabrice Di Meglio
8a5137a5ae Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height
- save current metrics values before updating them

Change-Id: I2d88dd7d30e8e01d0c5e2328973f256b689672b2
2011-09-23 13:40:58 -07:00
Dianne Hackborn
90c52de286 Fix issue #5173952: Opening a Notification From Lock Screen...
...Should Skip Unsecure Lockscreen (ICS)

Also while I am in there, clean up logging of intent objects to include
even less sensitive information, while showing the true Intent in dump
output (since apps can't get to that).

Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
2011-09-23 13:39:33 -07:00
Fabrice Di Meglio
651e46679b Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits" 2011-09-23 13:30:41 -07:00
Svetoslav Ganov
83a559e78f Merge "Scroll accessibility events should not populate text." 2011-09-23 13:26:18 -07:00
Amith Yamasani
e7d7056383 Merge "Launch nested preferences with the same theme as parent activity." 2011-09-23 13:24:38 -07:00
Christopher Tate
54303e6b23 am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom
* commit 'b20d378cec09da18301eb9c33bc88251beb81042':
  Don't crash during full backup when CheckJNI is enabled
2011-09-23 13:21:07 -07:00
Christopher Tate
b20d378cec Merge "Don't crash during full backup when CheckJNI is enabled" into ics-factoryrom 2011-09-23 13:19:33 -07:00
Scott Main
c86bc42cb1 Merge "docs: a few additions and revisions to action bar docs" 2011-09-23 13:13:13 -07:00
Christopher Tate
ca1605e6e3 Don't crash during full backup when CheckJNI is enabled
It's not okay to pass null to JNI methods and trust that it will just
back off and return a null result cleanly.  Fixes bug 5361822 .

Change-Id: Id8a17b958fd183d55cb6475f394e158c13aae2ea
2011-09-23 13:12:49 -07:00
Scott Main
e797ed6a74 docs: a few additions and revisions to action bar docs
Change-Id: I12c24e5d4ed49d8f9822050d330f617bd614b7b9
2011-09-23 12:56:20 -07:00
Adam Powell
90d33ccd16 Merge "Remove unnecessary parameter" 2011-09-23 12:45:13 -07:00
Ben Murdoch
9bb55bf015 Force a WebView pictureset invalidation on screen rotation.
This fixes some stale content issues when rotating the screen.

Bug: 5357237
Change-Id: Ib41a659ec99419cdf94ad5321c224a33b1f21359
2011-09-23 19:59:53 +01:00
Adam Powell
2b2f6d6c54 Remove unnecessary parameter
Change-Id: I32810a31140263a996d4f600fa53db5f29e60f42
2011-09-23 11:15:39 -07:00
Adam Powell
5c267ecec6 Merge "Fix leaky view tags" 2011-09-23 11:05:25 -07:00
Amith Yamasani
72e6bece43 Launch nested preferences with the same theme as parent activity.
Bug: 5351628
Change-Id: Id67b81558bc6e010d6f024cdb8117424aa6b62f0
2011-09-23 10:43:40 -07:00
Wei Huang
e448f557f6 am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
  Update camera javadoc about AE and AWB lock.
2011-09-23 10:05:22 -07:00
Wei Huang
3d9a9e55df Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 2011-09-23 10:04:02 -07:00
John Reck
2df8f425f6 Add detail to restorePicture deprecation
Bug: 5361506

Change-Id: I4bf6583170df50b218051f4700700ff1b8874d17
2011-09-23 09:27:01 -07:00
Wei Huang
4cd34752cb am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
  Clear callbacks in camera stopPreview.
2011-09-23 08:33:46 -07:00
Brandon Keely
c56c92013c Merge "Make LockScreen ping() on a miss." 2011-09-23 07:46:30 -07:00
Chih-yu Huang
664d72e663 Clear callbacks in camera stopPreview.
Clear those callbacks to remove the references
so the memory can be recycled.

bug:5358774
Change-Id: I3b6034a1891126b3437a6744013f38a64f5bb03b
2011-09-23 20:28:28 +08:00
Peter Ng
b48ca1f1ab am dd33bf0e: Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom
* commit 'dd33bf0ebbde9aa702d039b6b9d5f06ac0a69dfb':
  Fix 5355659: Minor tweak to wave ping radius in MultiWaveView.
2011-09-22 23:40:06 -07:00
Justin Ho
006dc043f0 am 4dfe8695: Merge "CAB assets" into ics-factoryrom
* commit '4dfe869520b83b79cc5912f5bd0061b0ec33aa11':
  CAB assets
2011-09-22 23:39:51 -07:00
Justin Ho
64edbc3093 am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom
* commit '777163e0466bda76d64809b5fd6a1a688de67099':
  Updated emergency icon on lockscreen
2011-09-22 23:39:49 -07:00