18124 Commits

Author SHA1 Message Date
Adam Cohen
8f700e9488 am 695976ab: am 0e2de6d7: Addressing API Review docs bugs:
* commit '695976ab8e05adf59743937e08a17bc59af4bcd6':
  Addressing API Review docs bugs:
2011-01-20 00:12:37 -08:00
Adam Cohen
695976ab8e am 0e2de6d7: Addressing API Review docs bugs:
* commit '0e2de6d7187ef67ec00a2f2544450caa4a239c39':
  Addressing API Review docs bugs:
2011-01-20 00:10:59 -08:00
Adam Cohen
0e2de6d718 Addressing API Review docs bugs:
->Issue 3370313
->Issue 3370403
->Issue 3370328
->kthx, bye

Change-Id: I2d1962c27b3ba856a0b4632d335271300bab45eb
2011-01-20 00:03:45 -08:00
Hung-ying Tyan
3ed8dcfc42 am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb
* commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c':
  Make VpnService synchronous API.
2011-01-19 22:46:32 -08:00
Hung-ying Tyan
9e0357b96b am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb
* commit '71196f0cb3406cc4b0b82643ca08b59a97bc4cc8':
  Make VpnService synchronous API.
2011-01-19 22:43:13 -08:00
Hung-ying Tyan
71196f0cb3 Merge "Make VpnService synchronous API." into honeycomb 2011-01-19 22:41:20 -08:00
Robert Ly
d9ce5c347e am e985c3a9: am 4c433225: Merge "Doc change: animation devguide topic" into honeycomb
* commit 'e985c3a9bdb5e7cb3dd7c3ea0894396717e83955':
  Doc change: animation devguide topic
2011-01-19 22:14:01 -08:00
Robert Ly
e985c3a9bd am 4c433225: Merge "Doc change: animation devguide topic" into honeycomb
* commit '4c4332250d9e6d2cb746625cc232052561c4d450':
  Doc change: animation devguide topic
2011-01-19 22:12:05 -08:00
Robert Ly
4c4332250d Merge "Doc change: animation devguide topic" into honeycomb 2011-01-19 22:09:47 -08:00
Romain Guy
91d61c6b31 am 821b82aa: am ed8f8dd8: Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb
* commit '821b82aaa1071b9ad69596ce0d0fae596ab1b171':
  Add rounded rects and circles support to OpenGLRenderer.
2011-01-19 21:57:26 -08:00
Adam Powell
bc7c2ad3ea am db0d2634: am 818a7bbf: Merge "Better fix for bug 3112733" into honeycomb
* commit 'db0d26348f5db934b1853fbc06b1ef46dd781e3a':
  Better fix for bug 3112733
2011-01-19 21:57:22 -08:00
Romain Guy
821b82aaa1 am ed8f8dd8: Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb
* commit 'ed8f8dd8cf621d6046db7e083f8a36205ed55609':
  Add rounded rects and circles support to OpenGLRenderer.
2011-01-19 21:54:34 -08:00
Adam Powell
db0d26348f am 818a7bbf: Merge "Better fix for bug 3112733" into honeycomb
* commit '818a7bbfb42061d67aae0d5c725cecd0261c9643':
  Better fix for bug 3112733
2011-01-19 21:54:30 -08:00
Romain Guy
ed8f8dd8cf Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb 2011-01-19 21:52:49 -08:00
Romain Guy
01d58e43ed Add rounded rects and circles support to OpenGLRenderer.
Change-Id: I6cedf2b495d58de7c0437096809fa9e4518a1b8c
2011-01-19 21:55:10 -08:00
Adam Powell
818a7bbfb4 Merge "Better fix for bug 3112733" into honeycomb 2011-01-19 21:52:33 -08:00
Patrick Dubroy
3386caa38c am ce06e78d: am a6abd062: previewImage API shouldn\'t be hidden.
* commit 'ce06e78db1280a91f3bba1cf5ca7a2cfbbf49492':
  previewImage API shouldn't be hidden.
2011-01-19 21:47:47 -08:00
Patrick Dubroy
ce06e78db1 am a6abd062: previewImage API shouldn\'t be hidden.
* commit 'a6abd062bf437fc69131a2797d6974953dd6cd83':
  previewImage API shouldn't be hidden.
2011-01-19 21:45:06 -08:00
Robert Ly
f99b782b9f Doc change: animation devguide topic
Change-Id: I52cdd29616f7f30784c0f8352c035493c8d413dc
2011-01-19 21:39:45 -08:00
Patrick Dubroy
a6abd062bf previewImage API shouldn't be hidden. 2011-01-19 21:39:01 -08:00
Adam Powell
5f83a6017b Better fix for bug 3112733
Make sure PopupWindows set to clip to the screen and that are anchored
to another view do not clip off the top of the screen.

Change-Id: I6ef9d61982dfda18a4ee7c69128932f5e08aa884
2011-01-19 21:09:43 -08:00
Hung-ying Tyan
6b818de29a Make VpnService synchronous API.
This eases VpnSettings on dealing with multiple-activity-instance problem
(i.e., SettingsActivity and VpnSettingsActivity).

+ Most of the code is moved from the VpnServices package to vpn/java/.
+ VpnManager and VpnServiceBinder are revised to provide synchronous API.
+ Add a new method isIdle() to IVpnService.aidl.

Related bug: 3293236 (need to deal with multiple-activity-instance problem)

Change-Id: I03afa3b3af85d7b4ef800683cd075c356a9266c4
2011-01-20 12:51:43 +08:00
Jim Miller
4b290bb60e am e744a6b7: am e25c4d10: Merge "Fix 3339257: Update lockscreen keyboard to fit Holo theme" into honeycomb
* commit 'e744a6b7016595ebb1de3a6bd24045731d60da30':
  Fix 3339257: Update lockscreen keyboard to fit Holo theme
2011-01-19 20:21:12 -08:00
Jim Miller
e744a6b701 am e25c4d10: Merge "Fix 3339257: Update lockscreen keyboard to fit Holo theme" into honeycomb
* commit 'e25c4d1077071e33795ec0316b504f6cd2a0ba08':
  Fix 3339257: Update lockscreen keyboard to fit Holo theme
2011-01-19 20:18:40 -08:00
Jim Miller
e25c4d1077 Merge "Fix 3339257: Update lockscreen keyboard to fit Holo theme" into honeycomb 2011-01-19 20:15:49 -08:00
Jim Miller
688435833f Fix 3339257: Update lockscreen keyboard to fit Holo theme
This updates the lockscreen keyboard to be like the
latin-1 IME keyboard and updates it to fit the holo theme.

Fixed some minor issues addressed in review.

Change-Id: I3c6dd8f91be753510e6eadfa9ad913f77038947b
2011-01-19 20:12:34 -08:00
Huahui Wu
ffe3e6c5d4 am 15ef4168: am 961d2c6a: Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb
* commit '15ef4168a9ce71f58d8d11cb531f88fdb4a3729d':
  b/3350774 avoid screen jumping when pinching to zoom.
2011-01-19 18:20:03 -08:00
Huahui Wu
15ef4168a9 am 961d2c6a: Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb
* commit '961d2c6acf9a4a61648f040aaaf1e40a83674d59':
  b/3350774 avoid screen jumping when pinching to zoom.
2011-01-19 18:18:25 -08:00
Huahui Wu
961d2c6acf Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb 2011-01-19 18:16:24 -08:00
Huahui Wu
1f30125c1c b/3350774 avoid screen jumping when pinching to zoom.
After the change that sends multi-touch to WebKit first, there is
a chance that the single-touch move event is handled before multi-
touch events are finished and this makes the page jumps.
This change skips those single-touch move events to avoid that.

Change-Id: I03992ef18c1de8e07933bd7cc6c12ffc02c014a8
2011-01-19 18:14:09 -08:00
Jeff Brown
c0d4062965 am e200420e: am d49f3e00: Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
* commit 'e200420e168ae135f6e87ee3a1abd44c971a1fe4':
  Rename KeyCharacterMap.UnavailableException.
2011-01-19 18:00:50 -08:00
Jeff Brown
e200420e16 am d49f3e00: Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
* commit 'd49f3e0078a79804e8dbd455c92786977a686020':
  Rename KeyCharacterMap.UnavailableException.
2011-01-19 17:58:32 -08:00
Jeff Brown
d49f3e0078 Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb 2011-01-19 17:56:32 -08:00
Jeff Brown
7e1e21fdc5 Rename KeyCharacterMap.UnavailableException.
Bug: 3370261
Change-Id: I5cdca8ef2300b70b7a0fcc7e2c26765079645ecc
2011-01-19 17:32:50 -08:00
Adam Powell
68a9841159 am 551771d2: am ed58d8ed: Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb
* commit '551771d2f36d9f0cd958c5b2cc7217abf8f46ae8':
  Fix bug 3112733 - Missing TLS encryption option in manual email account setup
2011-01-19 17:16:27 -08:00
Adam Powell
551771d2f3 am ed58d8ed: Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb
* commit 'ed58d8ed8a50cbd8c5e01c4e51bcbbe4341d1dfd':
  Fix bug 3112733 - Missing TLS encryption option in manual email account setup
2011-01-19 17:14:16 -08:00
Adam Powell
ed58d8ed8a Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb 2011-01-19 17:11:37 -08:00
Adam Powell
d2766aec6a Fix bug 3112733 - Missing TLS encryption option in manual email account setup
Make spinner popups observe global events that should change the
position of the popup.

Change-Id: Ia65204f594a6972b96d4db08c205770e340fcaf9
2011-01-19 17:09:29 -08:00
Jeff Brown
e26c4fe2c1 am 660c81bf: am 2cb866b9: Merge "Never drag scroll views with no children." into honeycomb
* commit '660c81bf3e6299e20c696a9073e9221dac51a09b':
  Never drag scroll views with no children.
2011-01-19 17:08:37 -08:00
Jeff Brown
660c81bf3e am 2cb866b9: Merge "Never drag scroll views with no children." into honeycomb
* commit '2cb866b948c38923b31331a9b2f031eb9d791e6e':
  Never drag scroll views with no children.
2011-01-19 17:05:57 -08:00
Jeff Brown
2cb866b948 Merge "Never drag scroll views with no children." into honeycomb 2011-01-19 17:03:08 -08:00
Romain Guy
273c2f34e5 am 208ee229: am eefc8248: Merge "Fix toasts." into honeycomb
* commit '208ee2291c3441b31040a33dfdf3b7fbf194ff20':
  Fix toasts.
2011-01-19 16:56:02 -08:00
Romain Guy
208ee2291c am eefc8248: Merge "Fix toasts." into honeycomb
* commit 'eefc82483a90f641275db3084b78c8254cc45046':
  Fix toasts.
2011-01-19 16:53:28 -08:00
Romain Guy
eefc82483a Merge "Fix toasts." into honeycomb 2011-01-19 16:51:44 -08:00
Romain Guy
cf3dd6bc69 Fix toasts.
Change-Id: I11916c55e8092169d2ab28c100bc7a152d60d432
2011-01-19 16:54:13 -08:00
Christopher Tate
ef3f7bd356 am 67265808: am 28f0a53a: Merge "Fail more gracefully when window state changes during drags" into honeycomb
* commit '67265808c10e53f305f59a65911d7bfcd82151a6':
  Fail more gracefully when window state changes during drags
2011-01-19 16:45:48 -08:00
Amith Yamasani
9a0470b2b2 am a70868a2: am 1c0012e1: Merge "Ensure that the column is valid before querying." into honeycomb
* commit 'a70868a25cb38f0a28deba232a86a5579f927774':
  Ensure that the column is valid before querying.
2011-01-19 16:45:44 -08:00
Christopher Tate
67265808c1 am 28f0a53a: Merge "Fail more gracefully when window state changes during drags" into honeycomb
* commit '28f0a53a882a39bc22bc5892250411cadf6c0d5d':
  Fail more gracefully when window state changes during drags
2011-01-19 16:43:14 -08:00
Amith Yamasani
a70868a25c am 1c0012e1: Merge "Ensure that the column is valid before querying." into honeycomb
* commit '1c0012e103a380489fe4a150247cd226de9a89a6':
  Ensure that the column is valid before querying.
2011-01-19 16:43:10 -08:00
Christopher Tate
28f0a53a88 Merge "Fail more gracefully when window state changes during drags" into honeycomb 2011-01-19 16:41:14 -08:00