David Ingram
9d50e4f4b2
Added definitions for the ways in which VoiceIME can be started.
...
This is for logging purposes. The three values BUTTON, SWIPE
and MOTION replace the boolean SWIPE parameter.
Change-Id: I3e8a275e2608781305e97851a797b18ccd3c68cd
2010-05-06 17:06:33 +01:00
Daniel Sandler
dac850dcf9
am 59bfdab3: am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
2010-05-04 17:46:19 -07:00
Dan Morrill
2f010e25c5
am 69a07917: am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
2010-05-04 17:46:13 -07:00
Joe Onorato
a3d9552ab6
am 6cb9d189: am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
2010-05-04 17:46:05 -07:00
Joe Malin
8f76cd9b35
Merge "Doc Change: Activity Testing/Hello, Testing tutorials doc files Change-ID: bddebe3eaaf722e2bd2a56d473b76a0a8e061053 Author: Joe Malin <jmalin@google.com> Date: Mon Mar 1 18:24:14 2010 -0800"
2010-05-04 16:16:24 -07:00
Shimeng (Simon) Wang
c07b48e17f
Merge "Remove svg from ignored rendertree tests list."
2010-05-04 13:53:48 -07:00
Daniel Sandler
20d6ada4b5
am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
2010-05-04 12:55:03 -07:00
Dan Morrill
1021f0ecaf
am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
2010-05-04 12:54:58 -07:00
Joe Onorato
e2c394f4f0
am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
2010-05-04 12:54:54 -07:00
Jake Hamby
bc64f14d8c
Merge "Fix a few more Javadoc typos."
2010-05-04 12:52:33 -07:00
Daniel Sandler
3adf5f2abf
am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
...
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken
* commit '342a3800b9b31929b337d298a24184d820f27f26':
Increase the row height of menus by 1dip.
2010-05-04 12:45:53 -07:00
Dan Morrill
2243017061
am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
...
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken
* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
Adding the backward-compatible filtering heuristics for the new device
2010-05-04 12:45:49 -07:00
Joe Onorato
25ab836708
am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
...
Merge commit '77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken
* commit '77da7312215c4a433e3f53c2fe306307fc3bad52':
Call into app widget hosts when the provider is updated.
2010-05-04 12:45:44 -07:00
Daniel Sandler
f27cbc7bed
am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
...
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp
* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
Increase the row height of menus by 1dip.
2010-05-04 12:42:48 -07:00
Daniel Sandler
2da986fbd2
Merge "Increase the row height of menus by 1dip." into froyo
2010-05-04 12:40:54 -07:00
Dan Morrill
34910b3d28
am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
...
Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp
* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
Adding the backward-compatible filtering heuristics for the new device
2010-05-04 12:38:03 -07:00
Joe Onorato
906a59288c
am f140be6c: Call into app widget hosts when the provider is updated.
...
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp
* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
Call into app widget hosts when the provider is updated.
2010-05-04 12:37:59 -07:00
Dan Morrill
515eb68646
Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
2010-05-04 12:03:45 -07:00
The Android Open Source Project
906b49c201
am 4929e5a5: am e4b9834f: am 6de3a6fd: merge from open-source master
2010-05-04 09:31:11 -07:00
The Android Open Source Project
31e7033c12
am e4b9834f: am 6de3a6fd: merge from open-source master
2010-05-04 09:29:27 -07:00
The Android Open Source Project
61aee0c845
am 6de3a6fd: merge from open-source master
...
Merge commit '6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken
* commit '6de3a6fdd303b15ad944570daf37faa798dc1989':
Fix typo of <p> end tag in appwidgets.xml
2010-05-04 09:27:35 -07:00
The Android Open Source Project
00ad0d2d5c
merge from open-source master
...
Change-Id: I5f552b45caae639170674213c23f154437b58afd
2010-05-04 09:20:16 -07:00
Jack Palevich
43a107057f
Merge "Declare that testViewport targets Froyo APIs"
2010-05-03 21:28:30 -07:00
Paul Westbrook
9c1b461a42
Merge "Fix Gmail unit test"
2010-05-03 16:30:43 -07:00
The Android Open Source Project
7d09e146d6
am facad955: am dcb5f18f: am 007ad770: merge from open-source master
2010-05-03 16:28:29 -07:00
The Android Open Source Project
fd9abb8086
am dcb5f18f: am 007ad770: merge from open-source master
2010-05-03 16:26:53 -07:00
Romain Guy
a4b249c12f
Merge "Fix typo of <p> end tag in appwidgets.xml"
2010-05-03 16:25:34 -07:00
The Android Open Source Project
439dcb36ed
am 007ad770: merge from open-source master
...
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken
* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
Adapt to new location of libcore
Parse custom text header and ignore it.
Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
'uses-library' was not working for persistent applications.
Fix an NPE in InputMethodService when mExtractAction is null.
2010-05-03 16:25:15 -07:00
The Android Open Source Project
0fb44af855
merge from open-source master
...
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
2010-05-03 16:19:31 -07:00
Gilles Debunne
1af2a90289
Merge "Raw types warnings removed."
2010-05-03 16:03:55 -07:00
Erik
88c538d1f7
Merge "Added access fields for second timezone columns."
2010-05-03 13:53:21 -07:00
Vasu Nori
53d2b737c9
Merge "sometimes database lock is not held before compiling a statement"
2010-05-03 13:05:06 -07:00
Daniel Lehmann
cea0652465
Merge "Allow contact-sources to rename the term "All Contacts""
2010-05-03 09:56:48 -07:00
Jean-Baptiste Queru
279f737e23
am d84509d5: am 05bcf755: am 2529d4ea: Adapt to new location of libcore
2010-05-02 16:17:23 -07:00
Jean-Baptiste Queru
996694e2f0
am 05bcf755: am 2529d4ea: Adapt to new location of libcore
2010-05-02 16:15:26 -07:00
Jean-Baptiste Queru
c95afe73fd
am 2529d4ea: Adapt to new location of libcore
...
Merge commit '2529d4eab80778aef9c7a9fe27712a41686d22c4' into kraken
* commit '2529d4eab80778aef9c7a9fe27712a41686d22c4':
Adapt to new location of libcore
2010-05-02 16:11:32 -07:00
Xia Wang
2bee58dbdc
am 011056c2: am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken
2010-04-30 15:51:41 -07:00
Xia Wang
f20b47880b
am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken
2010-04-30 15:50:25 -07:00
Xia Wang
e981b356e1
Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken
2010-04-30 15:49:23 -07:00
Jean-Baptiste Queru
0adef024b2
am 69d5a7ce: am 5b559e81: Adapt to new location of libcore
2010-04-30 15:08:57 -07:00
Mathias Agopian
4e448523e7
am 8f227c96: am 3b91e13e: make sure the server-side validates pointers/indices visible on the client side
2010-04-30 15:08:40 -07:00
Jean-Baptiste Queru
127f770a13
am 0d5ad0fb: Merge "Adapt to new location of libcore" into kraken-plus-aosp
2010-04-30 15:08:36 -07:00
Mathias Agopian
25a58efa19
am 1bb8b670: Merge "Add support for enqueuing buffers in arbitrary order" into kraken
2010-04-30 15:08:10 -07:00
Daniel Sandler
9da3b7247a
am b205daba: am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
2010-04-30 15:07:37 -07:00
Jean-Baptiste Queru
257810f55b
am 5b559e81: Adapt to new location of libcore
2010-04-30 13:20:48 -07:00
Mathias Agopian
067579650f
am 3b91e13e: make sure the server-side validates pointers/indices visible on the client side
2010-04-30 13:08:41 -07:00
Mathias Agopian
d52128786f
make sure the server-side validates pointers/indices visible on the client side
...
Change-Id: I604f58d3fcd2d09ec7998123c627401081345cd6
2010-04-30 13:05:36 -07:00
Jean-Baptiste Queru
0fc2f0a3de
Merge "Adapt to new location of libcore" into kraken-plus-aosp
2010-04-30 13:05:18 -07:00
Mathias Agopian
30c4c182ec
Merge "Add support for enqueuing buffers in arbitrary order" into kraken
2010-04-30 12:58:11 -07:00
Daniel Sandler
bfe2180f5c
am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
...
Merge commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8' into kraken
* commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8':
Tweak style of recent apps dialog title.
2010-04-30 11:34:03 -07:00