41775 Commits

Author SHA1 Message Date
Iain Merrick
8192b4179f Merge "Add BrowserFrame.setCertificate() method." into honeycomb 2011-01-20 08:17:15 -08:00
Ken Wakasa
f41e1af8c0 am 7fff9d8e: am 586f0513: Refine InputMethodInfo API
* commit '7fff9d8e0489455363eb2d70111b7164adab46ff':
  Refine InputMethodInfo API
2011-01-20 08:16:05 -08:00
Ken Wakasa
7fff9d8e04 am 586f0513: Refine InputMethodInfo API
* commit '586f051375d8d7aeece05329921f9f66fc6164cb':
  Refine InputMethodInfo API
2011-01-20 08:14:19 -08:00
Ken Wakasa
586f051375 Refine InputMethodInfo API
bug: 3370297
Change-Id: I2a18f3bdbe2fccb22e22cdae0f75aec5c703ad6d
2011-01-21 01:02:58 +09:00
Glenn Kasten
e9b467d7dd Bug 3361124 Remove drmioserver
Change-Id: I64cba4be8a38b60bf3873836b4cd0d1039e19706
2011-01-20 07:50:59 -08:00
Irfan Sheriff
43e747ef59 Add untether call during softap shutdown
Bug: 3355187
Change-Id: Ie4381648883186a216807bcd0d586ecfd00ca15c
2011-01-20 07:47:21 -08:00
Tadashi G. Takaoka
d738d87e13 am b1ba4367: am 317b2ea1: Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb
* commit 'b1ba4367b6ef046ec137345932318265f210a205':
  Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
2011-01-20 07:41:12 -08:00
Tadashi G. Takaoka
b1ba4367b6 am 317b2ea1: Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb
* commit '317b2ea16a9ba681ee185d5b7a0c385a1fdbe1d5':
  Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
2011-01-20 07:37:14 -08:00
Iain Merrick
b890e758ef Add BrowserFrame.setCertificate() method.
This is needed for the Chrome HTTP stack to report SSL
certificates to WebView, in order to pass the CTS.

Change-Id: I0752a836ebaea21eae2084f037b18de4168f271f
2011-01-20 15:33:41 +00:00
Tadashi G. Takaoka
317b2ea16a Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb 2011-01-20 07:30:36 -08:00
Tadashi G. Takaoka
2548020c36 Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
Change-Id: Iecb7a9c265cafe96e7eec099341133da8e966f6f
2011-01-21 00:15:29 +09:00
James Dong
44b004b0c2 Eliminate recording sound by starting the video track before audio track.
Due to the variable delays in the system, the recording sound can still be heard
if the audio track is started early. This happens even after we suppress a relative
long period of initial audio for a recording session. By starting the video track
before the audio track, we effectively play the recording sound earlier.

bug - 3371141

Change-Id: I2cccf77eae953d96827fc080c618b1d962445c26
2011-01-20 06:58:16 -08:00
Kristian Monsen
28f37efe30 am 6e8831cf: am 7450a32b: Merge "Clear the files we copy over to the temp cache" into honeycomb
* commit '6e8831cf2d7fd90ab124f58a9fc1919fac818887':
  Clear the files we copy over to the temp cache
2011-01-20 06:40:08 -08:00
Kristian Monsen
6e8831cf2d am 7450a32b: Merge "Clear the files we copy over to the temp cache" into honeycomb
* commit '7450a32bab8945738589d7b323953cdc80de111f':
  Clear the files we copy over to the temp cache
2011-01-20 06:37:24 -08:00
Daniel Sandler
8db90d6311 am 10ce547f: am 4e10c2b9: Merge "Simplify and smooth notification panel animation." into honeycomb
* commit '10ce547f1c62bfbdd7160ae7426a2a7d5aaf2813':
  Simplify and smooth notification panel animation.
2011-01-20 06:36:55 -08:00
Daniel Sandler
10ce547f1c am 4e10c2b9: Merge "Simplify and smooth notification panel animation." into honeycomb
* commit '4e10c2b9d731cc8a8bfb63bf954624cece2c85ae':
  Simplify and smooth notification panel animation.
2011-01-20 06:35:19 -08:00
Kristian Monsen
7450a32bab Merge "Clear the files we copy over to the temp cache" into honeycomb 2011-01-20 06:33:55 -08:00
Daniel Sandler
4e10c2b9d7 Merge "Simplify and smooth notification panel animation." into honeycomb 2011-01-20 06:33:44 -08:00
Kristian Monsen
cedb3a7e58 Clear the files we copy over to the temp cache
Fixes CTS tests

Change-Id: I3464ac90e58a9df21379a8da9d637f4f5ee69b85
2011-01-20 14:31:20 +00:00
Tadashi G. Takaoka
2ee0635d46 am 6c51e1fc: am 90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
* commit '6c51e1fc9dd61bf5c269590305b3276f9e38c1ef':
  Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
2011-01-20 05:21:18 -08:00
Tadashi G. Takaoka
6c51e1fc9d am 90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
* commit '90fcb2ad9378ee89f6795942c2b065a32bc83895':
  Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
2011-01-20 05:19:35 -08:00
Tadashi G. Takaoka
90fcb2ad93 Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb 2011-01-20 05:17:51 -08:00
Tadashi G. Takaoka
f49688fa17 Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
Change-Id: I27c318777355991ae4ad72d0b2480e93c8c5044e
2011-01-20 22:02:56 +09:00
Chia-chi Yeh
4cdd0c0afb am 956b9ed7: am 7ccaba69: Merge "Update the path of the intent to unlock keystore." into honeycomb
* commit '956b9ed7fc20c4e1b03d794b0817dd08341ac229':
  Update the path of the intent to unlock keystore.
2011-01-20 04:32:06 -08:00
Chia-chi Yeh
956b9ed7fc am 7ccaba69: Merge "Update the path of the intent to unlock keystore." into honeycomb
* commit '7ccaba693bd328968baf3f117b286659ce4a2a75':
  Update the path of the intent to unlock keystore.
2011-01-20 04:30:13 -08:00
Chia-chi Yeh
7ccaba693b Merge "Update the path of the intent to unlock keystore." into honeycomb 2011-01-20 04:29:11 -08:00
Chia-chi Yeh
527f01e76d Update the path of the intent to unlock keystore.
Change-Id: Ia81d0c172f2be6d04cba4db6e6798058f321605d
2011-01-20 20:23:59 +08:00
Ben Murdoch
0e70fd4b40 am f6f0ffd8: am 7e73ce90: DRT needs to clear cookies between tests.
* commit 'f6f0ffd888f8ab5db30bfddf3a9b9d0cebdb81b9':
  DRT needs to clear cookies between tests.
2011-01-20 03:48:17 -08:00
Ben Murdoch
f6f0ffd888 am 7e73ce90: DRT needs to clear cookies between tests.
* commit '7e73ce90d6fc6125a0e2f1bb65495efa1816bb1b':
  DRT needs to clear cookies between tests.
2011-01-20 03:46:33 -08:00
Ben Murdoch
58195e45c0 am 7cbea406: am 0b5bd35f: Add case-sensitive tests to DRT ignore list.
* commit '7cbea406d8e580fea5ab23c3d65df3601c6803f3':
  Add case-sensitive tests to DRT ignore list.
2011-01-20 03:45:11 -08:00
Ben Murdoch
7cbea406d8 am 0b5bd35f: Add case-sensitive tests to DRT ignore list.
* commit '0b5bd35f60507e6899419d4fa3cecc89e2cee9f9':
  Add case-sensitive tests to DRT ignore list.
2011-01-20 03:43:30 -08:00
Ben Murdoch
7e73ce90d6 DRT needs to clear cookies between tests.
Fixes failure seen in fast/cookies/local-file-can-set-cookies.html

Change-Id: I08b8a0fcf87003fa4621dce08604bf42e70e4635
2011-01-20 11:22:10 +00:00
Ben Murdoch
0b5bd35f60 Add case-sensitive tests to DRT ignore list.
/mnt/sdcard forces lowercase, but these tests verify
the capitialization of the filename. We will never pass them
with DRT1 while storing tests on external storage. DRT2 will
fix this as it does not store any files locally (hence DRT2's
ignore list is unchanged).

Change-Id: Ia062ad77ad312a34db61d606a1d1382ac1d7b70e
2011-01-20 10:52:24 +00:00
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
Daniel Sandler
add2620423 Simplify and smooth notification panel animation.
Bug: 3322970
Change-Id: I3e658cfb542d605b13f6b7d935e32e5b8766078f
2011-01-20 03:07:02 -05: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
Scott Main
a0e81da072 am 364e92db: am e65b0f8d: Merge "Doc change: adding missing nfc demo png" into honeycomb
* commit '364e92dbefb8525ab53b164ac7900487bebd0cc2':
  Doc change: adding missing nfc demo png
2011-01-19 23:04:17 -08:00
Scott Main
364e92dbef am e65b0f8d: Merge "Doc change: adding missing nfc demo png" into honeycomb
* commit 'e65b0f8df03c16765b5ece94e5c9c6d75042cae0':
  Doc change: adding missing nfc demo png
2011-01-19 23:02:00 -08:00
Scott Main
e65b0f8df0 Merge "Doc change: adding missing nfc demo png" into honeycomb 2011-01-19 22:58:08 -08:00
Robert Ly
50241d5c27 Doc change: adding missing nfc demo png
Change-Id: Id96b13f4d075cec48dbc528c8396d1c2f6ed50d9
2011-01-19 22:52:18 -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
Scott Main
d45f5711f3 am 9376f272: am 242d556c: Merge "Doc change: adding missing samples" into honeycomb
* commit '9376f272516e9b4376c763086d7471d1cbee23e7':
  Doc change: adding missing samples
2011-01-19 22:42:22 -08:00
Hung-ying Tyan
71196f0cb3 Merge "Make VpnService synchronous API." into honeycomb 2011-01-19 22:41:20 -08:00
Scott Main
9376f27251 am 242d556c: Merge "Doc change: adding missing samples" into honeycomb
* commit '242d556c983a370ee4fec53154d1ef8b04276eb7':
  Doc change: adding missing samples
2011-01-19 22:39:16 -08:00
Wink Saville
48f53ec7f4 Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE
Add DNS and gateway as parameters to RIL_REQUEST_SETUP_DATA_CALL so that
system properties aren't used for passing these to the ril. System
properties that are read right after a write doesn't always see the
result of the write. Another words writing system properties are not
not sequentially consistent.

Bug: 3364487
Change-Id: Ib7cba74346395323f3feb927281695663d9935ac
2011-01-19 22:38:24 -08:00
Scott Main
242d556c98 Merge "Doc change: adding missing samples" into honeycomb 2011-01-19 22:37:21 -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