55620 Commits

Author SHA1 Message Date
Jesse Wilson
a92e5a8a7c Restore the 'final' bit on DataInputStream.read()
This was lost in a recent refactoring.

Change-Id: I31bc9cd5c4015135c4074d9b564edf5a9cc2ecd5
2011-07-29 17:03:19 -04:00
Kristian Monsen
abecca9c60 Merge "Part of fix for bug 4997380: Some error types unknown to SslError" 2011-07-29 12:35:45 -07:00
Derek Sollenberger
ecfeebebff Merge "Add a runtime switch between Raster and Ganesh rendering modes." 2011-07-29 12:34:32 -07:00
Derek Sollenberger
a66754356f Merge "resolved conflicts for merge of 13639b0d to master" 2011-07-29 12:28:16 -07:00
Mike Lockwood
5c5db7c0f0 Merge "Clean up USB configuration switching logic and beef up error handling" 2011-07-29 12:13:04 -07:00
Kristian Monsen
0d6c6a73c6 Part of fix for bug 4997380: Some error types unknown to SslError
Use the new SslError chromium error codes parser.

Change-Id: I0b5584bd3f3e042600caebe72f4e41989318cd6a
2011-07-29 20:10:21 +01:00
Gilles Debunne
9ba79560bf Merge "New interaction model for suggestions" 2011-07-29 11:47:12 -07:00
Mike Lockwood
68736cbf93 Clean up USB configuration switching logic and beef up error handling
Bug: 5050853

Change-Id: Ia00698e2adbb8a7d7698e2ae306413f6c715fbdb
2011-07-29 14:41:14 -04:00
Derek Sollenberger
bbac14ba60 resolved conflicts for merge of 13639b0d to master
Change-Id: I6fb2ac2702fc662c1892537de6d4db20d5e709d6
2011-07-29 14:39:06 -04:00
Amith Yamasani
44df62c441 Merge "Don't submit a query if it's whitespace only." 2011-07-29 11:28:37 -07:00
Derek Sollenberger
13639b0d07 Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-07-29 11:24:37 -07:00
Svetoslav Ganov
b07dbeb572 Merge "InputFilter not updated on global accessibility change." 2011-07-29 11:22:42 -07:00
Christopher Tate
e0fe39387a Merge "Require the current backup pw in all backup/restore operations" 2011-07-29 11:20:45 -07:00
Derek Sollenberger
a30ed30b75 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
2011-07-29 14:16:18 -04:00
Robert Greenwalt
f9665221aa am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8':
  Fix NPE when going from proxy to no proxy.
2011-07-29 10:55:58 -07:00
Daniel Sandler
bd176f36ca Merge "Quick fix for NPE in updateNotification()." 2011-07-29 10:53:17 -07:00
Robert Greenwalt
a128f5f8c9 am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
  Fix NPE when going from proxy to no proxy.
2011-07-29 10:53:16 -07:00
Robert Greenwalt
1a230885b3 Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE 2011-07-29 10:51:32 -07:00
Dianne Hackborn
bb96bf6e47 Merge "Various work on out of memory managment." 2011-07-29 10:43:26 -07:00
Derek Sollenberger
f4fd53b381 Merge "Fix NinePatch decoder when the target is smaller than the source." 2011-07-29 10:41:12 -07:00
Robert Greenwalt
fde1eb7cf8 Fix NPE when going from proxy to no proxy.
bug:5081431
Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833
2011-07-29 10:03:37 -07:00
Derek Sollenberger
b7f09f28b9 am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.
2011-07-29 09:53:09 -07:00
Derek Sollenberger
b7ed8471f1 am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.
2011-07-29 09:50:11 -07:00
Daniel Sandler
2fb30a92d5 Quick fix for NPE in updateNotification().
When the "ongoing"/"latest" split is removed, this will be
replaced with something less odious.

Bug: 5090331
Change-Id: Ib804de66985ff5f5df2e1df3c85437a1e31f1c49
2011-07-29 12:50:06 -04:00
Daniel Sandler
1e833b31ee Merge "Fix NPE for devices with hardware navigation." 2011-07-29 09:49:13 -07:00
Nick Pelly
5ff1c1591f Merge "Workaround for bug 5082381 (EALREADY on ACL collision)." 2011-07-29 09:44:30 -07:00
Daniel Sandler
6619852ecd Merge "Protect animation methods from Proguard." 2011-07-29 09:43:30 -07:00
Derek Sollenberger
01caec8c41 Merge "Adding an optional param to the SurfaceTexture constructor." 2011-07-29 09:43:13 -07:00
Daniel Sandler
f3f2011285 Fix NPE for devices with hardware navigation.
Bug: 5095974
Change-Id: I4d8c39fbff6feb7b65055938ac0f725faaa6e6a3
2011-07-29 12:41:54 -04:00
Daniel Sandler
dfab18171c Protect animation methods from Proguard.
Bug: 5096417
Change-Id: I5546dfe0092747c311836bb2134b52be58d77b98
2011-07-29 12:41:25 -04:00
Robert Greenwalt
be591d736e am 86574d66: am 0d8acea9: Make copy-constructor make deep copy.
* commit '86574d66dacc09c9b5a0a0ab2623ec01704b6fc8':
  Make copy-constructor make deep copy.
2011-07-29 09:24:38 -07:00
Robert Greenwalt
86574d66da am 0d8acea9: Make copy-constructor make deep copy.
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
  Make copy-constructor make deep copy.
2011-07-29 09:20:51 -07:00
Derek Sollenberger
0e4afa1fb1 Adding an optional param to the SurfaceTexture constructor.
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
2011-07-29 11:06:24 -04:00
Derek Sollenberger
c4c458c678 Fix NinePatch decoder when the target is smaller than the source.
If the target is smaller on a given axis than the source then we
just draw a downscaled version of the NinePatch.  If we use the
current path and the source has transparency then areas of the
NinePatch overlap and are blended together resulting in visual
inconsistancy.

bug: 5041053
Change-Id: I0fcc6fb5c214b188a164acf0651aa4ab2f35946d
2011-07-29 10:34:47 -04:00
Daniel Sandler
94eea0b26e Merge "Bring the shiny navigation button animations to phones." 2011-07-29 06:48:43 -07:00
Daniel Sandler
53f2531ba7 Merge "The fullest of fullscreen modes." 2011-07-29 05:45:55 -07:00
Daniel Sandler
5298582717 Bring the shiny navigation button animations to phones.
Also fix the accessibility descriptions (bad merge?).

Bug: 4541219
Change-Id: I8a8e2a14e5557c45af0b9e74b0bd654ff804aab9
2011-07-29 08:44:09 -04:00
Daniel Sandler
cdbb950afe Merge "New richly-appointed navigation buttons." 2011-07-29 04:52:44 -07:00
Daniel Sandler
1bde86bd1b Merge "Correct android:dimen/status_bar_icon_size for tablets." 2011-07-29 04:52:01 -07:00
Kristian Monsen
ad65b46d5f Merge "Part of fix for bug 5065047 build libchromium as a shared lib" 2011-07-29 03:37:49 -07:00
satok
6d9a14c083 Merge "Fix issues in TextServicesManagerService" 2011-07-29 03:29:46 -07:00
satok
df5659d3d3 Fix issues in TextServicesManagerService
Change-Id: I48c81226d824e8aad42e01e87fcf9a5b466d2321
2011-07-29 19:09:14 +09:00
Dianne Hackborn
c68c913d35 Various work on out of memory managment.
- Improve how we handle processes that have shown UI, to take care
  of more cases where we want to push them into the background LRU
  list.
- New trim memory level for when an application that has done UI
  is no longer visible to the user.
- Add APIs to get new trim memory callback.
- Add a host of new bind flags to tweak how the system will adjust
  the OOM level of the target process.

Change-Id: I23ba354112f411a9f8773a67426b4dff85fa2439
2011-07-29 02:06:46 -07:00
Daniel Sandler
3815706c4e Correct android:dimen/status_bar_icon_size for tablets.
Bug: 5086130
Change-Id: I32e7ec93b87cdde20e1a250e139d2ec0b90baac2
2011-07-29 00:56:57 -04:00
Daniel Sandler
a375c94fca New richly-appointed navigation buttons.
- Beautiful new touch feedback animations
 - Romantic icon dimming
 - Supple Corinthian leather

Bug: 4541219
Change-Id: I8c4e1ec73aba910a17001795d2b03200c5af1788
2011-07-29 00:38:55 -04:00
Svetoslav Ganov
a31f5e6374 InputFilter not updated on global accessibility change.
Change-Id: I35fd5fa078840abf62a3d5eac66b2eae1a79d01d
2011-07-28 20:18:10 -07:00
Jean Chalard
3970f6833d Merge "Fix a bug where a provider could be never released." 2011-07-28 19:36:32 -07:00
Romain Guy
c564042a3e Merge "Don't create hw layers when there's no hw context. Bug #5093805" 2011-07-28 19:25:29 -07:00
Romain Guy
ea83503e86 Don't create hw layers when there's no hw context.
Bug #5093805

Change-Id: Ia58b3381c83b9a200e80020e5c1b9c337ad6c35c
2011-07-28 19:24:37 -07:00
Nick Pelly
fbbea2e1bf Workaround for bug 5082381 (EALREADY on ACL collision).
If connect() fails with EALREADY, then retry.

Unfortunately we also need to switch to a new FD. This is currently
safe, but its a little fragile to changes in the code (especially
if we ever expose the fd to applications) so it would be great to
fix this issue properly in the kernel sometime and revert this
commit.

Change-Id: I12fb6b7f2b8ca40f425f66b504754048c9460329
2011-07-28 18:11:34 -07:00