12212 Commits

Author SHA1 Message Date
Adam Powell
8350f7dbc3 Added CHOICE_MODE_MULTIPLE_MODAL to ListView.
Based on ActionModes, CHOICE_MODE_MULTIPLE_MODAL supports the new
Honeycomb-style selection mode.

Change-Id: I293ea22487db8e081c95e5236f1e053f7dd4ada6
2010-08-02 11:28:31 -07:00
Brad Fitzpatrick
8b13ed701b am 4edd80db: am ee34a49f: Add missing word from docs.
Merge commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c'

* commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c':
  Add missing word from docs.
2010-08-02 08:09:07 -07:00
Brad Fitzpatrick
4edd80db95 am ee34a49f: Add missing word from docs.
Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp

* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
  Add missing word from docs.
2010-08-02 08:02:05 -07:00
Brad Fitzpatrick
ee34a49ffc Add missing word from docs.
My mistaker from an earlier commit.

Change-Id: Ic04b3c411da32f7dca03d23d39182915e3567172
2010-08-02 07:54:18 -07:00
Romain Guy
eb4e0c3c1c Merge "Refactor Skia shaders handling." 2010-07-30 19:20:09 -07:00
Romain Guy
06f96e2652 Refactor Skia shaders handling.
With this change, Skia shaders can easily be applied to any mesh. This change also
supports ComposeShader. For instance, this can be used to blend a gradient and a
bitmap togehter and paint a string of text with the result.

Change-Id: I701c2f9cf7f89b2ff58005e8a1d0d80ccf4a4aea
2010-07-30 19:18:16 -07:00
Adam Powell
26fda2340a Merge "Add action mode decor to layout.screen_simple" 2010-07-30 17:14:52 -07:00
Chet Haase
4de823a759 Merge "Fix problems with moving Views around (invalidation, conflict with layout)" 2010-07-30 17:14:29 -07:00
Tadashi G. Takaoka
c8f5e43719 Merge "Fix KeyboardView's verticalCorrection handling" 2010-07-30 16:34:06 -07:00
Tadashi G. Takaoka
0972d071cd Fix KeyboardView's verticalCorrection handling
Do not correct the touch point if it is within the range of
verticalCorrection from the top of KeyboardView, so that the touch
point will not have negative y-axis value.

Bug: 2659128

Change-Id: I91a3e65fc5dee1383dbbfb45690e307fc0adc1d1
2010-07-30 16:08:47 -07:00
Brad Fitzpatrick
86dde2d64c am e2d33bbc: am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit 'e2d33bbc496192d49c1e48baad446d8d0720d301'

* commit 'e2d33bbc496192d49c1e48baad446d8d0720d301':
  StrictMode: time violations in Binder calls
2010-07-30 15:27:56 -07:00
Brad Fitzpatrick
e2d33bbc49 am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
2010-07-30 15:23:19 -07:00
Brad Fitzpatrick
d2165cfce7 Merge "StrictMode: time violations in Binder calls" into gingerbread 2010-07-30 15:20:28 -07:00
Adam Powell
b8863d96ef Add action mode decor to layout.screen_simple
Change-Id: I30ae9bcd484b33a4f64de94f82cc302189e50b9a
2010-07-30 15:10:33 -07:00
Chet Haase
8fbf8d2b08 Fix problems with moving Views around (invalidation, conflict with layout)
Change-Id: I38f8f8a4e8082854a53a2975da258b5d946ed525
2010-07-30 15:01:32 -07:00
Brad Fitzpatrick
cb9ceb1029 StrictMode: time violations in Binder calls
Change-Id: I5796993dce98be722cf679b78acaf0c9de0ba461
2010-07-30 14:28:55 -07:00
Xia Wang
903d445f41 am 131ce67d: Merge "DO NOT MERGE" into gingerbread
Merge commit '131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp

* commit '131ce67d276416e3cb23a5e31121fdff1a8bf290':
  DO NOT MERGE
2010-07-30 13:46:24 -07:00
Xia Wang
131ce67d27 Merge "DO NOT MERGE" into gingerbread 2010-07-30 13:44:23 -07:00
Daniel Sandler
84383376d8 Merge "More readable Configuration#toString() output." 2010-07-30 12:10:33 -07:00
Dmitri Plotnikov
025b6ec308 Merge "Adding a lookup URI to simplify loading of a contact" 2010-07-30 12:03:17 -07:00
Gilles Debunne
56329b46ad am 628be513: am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '628be513e67ce6c61884b1baaf0379abfc56100b' into gingerbread-plus-aosp

* commit '628be513e67ce6c61884b1baaf0379abfc56100b':
  Fixed doc typos in HeterogeneousExpandableList.java.
2010-07-30 11:56:24 -07:00
Gilles Debunne
628be513e6 am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread

* commit '83884db9dc0fbddb6ece566284259f6b941beb33':
  Fixed doc typos in HeterogeneousExpandableList.java.
2010-07-30 11:53:16 -07:00
Andy McFadden
1951356a71 Merge "Add support for dalvik.vm.extra-opts property." 2010-07-30 11:26:29 -07:00
Steve Howard
48c05739dd am 6a114b21: am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76'

* commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76':
  Update Context.getSystemService() docs for download manager.
2010-07-30 11:15:44 -07:00
Steve Howard
6a114b211a am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp

* commit '7c600369c9695de73ca37db552eb81b8b89d5e76':
  Update Context.getSystemService() docs for download manager.
2010-07-30 11:12:28 -07:00
Steve Howard
7c600369c9 Merge "Update Context.getSystemService() docs for download manager." into gingerbread 2010-07-30 11:09:48 -07:00
Andy McFadden
e4d81f25bd Add support for dalvik.vm.extra-opts property.
The goal here is to avoid the dalvik.vm.* property explosion by
having a single property that takes an arbitrary collection of Dalvik
command-line options.  This is intended for testing of various
configurations by the Dalvik team, not industrial use.

Options should be separated by spaces, e.g.

  adb shell setprop dalvik.vm.extra-opts "-showversion -Xmx4m"

will print the version banner and set the heap max to 4MB, which won't
get you very far.

The extra-opts options will appear last, which allows them to override
values set earlier (like the heap max).

Bug 2838629.

(cherry-pick from dalvik-dev branch)

Change-Id: Ibcbb1b62367cf2152798583e8722ef7e461ad19a
2010-07-30 10:57:47 -07:00
Mathias Agopian
fdece4bbbf resolved conflicts for merge of dfce290b to master
Change-Id: I9caace962cb0a697dd99ed92c5f35e57690fdf91
2010-07-29 22:22:36 -07:00
Mathias Agopian
ce49d03aa4 resolved conflicts for merge of 02513855 to master
Change-Id: Ie33d57798d3d5b800edde753dac86de062bc270c
2010-07-29 22:06:44 -07:00
Xia Wang
8f076ec3c3 DO NOT MERGE
move change to gingerbread.

Wait for broadcast even if the network state has been changed.
bug: 2863356

Change-Id: Ia78d1d6c2906371b56dfd4765845431047e9e9c0
2010-07-29 19:15:33 -07:00
Dianne Hackborn
8952f695a3 Fix crash.
Change-Id: Ie8871376213930f1c57ea5f8e67142daf7fbe089
2010-07-29 19:07:23 -07:00
Dmitri Plotnikov
b2ce481c81 Adding a lookup URI to simplify loading of a contact
This will be initially used by the editor to load
the entire contacts in a consistent manner either
locally or from a Directory.

Change-Id: I0e02b1b35cbbb3c4443063684641c928e5ac5318
2010-07-29 18:28:50 -07:00
Mathias Agopian
dfce290b80 am 04d7e83e: Added SensorManager.getAltitude()
Merge commit '04d7e83e65e246e154b5b346e3eb0081b741ae88' into gingerbread-plus-aosp

* commit '04d7e83e65e246e154b5b346e3eb0081b741ae88':
  Added SensorManager.getAltitude()
2010-07-29 18:21:03 -07:00
Mathias Agopian
0251385553 am 050b5624: Added SensorManager.getMinDelay()
Merge commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9' into gingerbread-plus-aosp

* commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9':
  Added SensorManager.getMinDelay()
2010-07-29 18:20:51 -07:00
Mathias Agopian
04d7e83e65 Added SensorManager.getAltitude()
this is a helper function to calculate the altitude from the
pressure and pressure at sea level.

Change-Id: I3f6f14fee6190388f95afa36a66287e3d59eef9b
2010-07-29 18:18:01 -07:00
Mathias Agopian
050b56244f Added SensorManager.getMinDelay()
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).

Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.

Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
2010-07-29 18:18:00 -07:00
Gilles Debunne
5d658d048e Fixed doc typos in HeterogeneousExpandableList.java.
Bad links.

Cherry-pick from master for a documentation update.
https://android-git.corp.google.com/g/#change,59176

Change-Id: Ib69b05c09fc80434cb9cd79d61fae4035adc1970
2010-07-29 16:56:25 -07:00
Vasu Nori
dea9713387 expose more sqlite errors as exceptions
this should help developers figure out what various sqlite errors mean
and possibly programmatically handle them.

Change-Id: I5c313be1b17b6c5171929bf04e19a16ea92bb357
2010-07-29 14:57:08 -07:00
Romain Guy
15d6184be7 am ff74e22b: am ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Merge commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2'

* commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2':
  Corrected buffer overflow when parsing /proc/wakelocks
2010-07-29 14:36:29 -07:00
Romain Guy
ff74e22b59 am ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Merge commit 'ce3ac5f02970fcab91e16ecb573931d209b1985c' into gingerbread-plus-aosp

* commit 'ce3ac5f02970fcab91e16ecb573931d209b1985c':
  Corrected buffer overflow when parsing /proc/wakelocks
2010-07-29 14:32:34 -07:00
Romain Guy
ce3ac5f029 Merge "Corrected buffer overflow when parsing /proc/wakelocks" 2010-07-29 14:00:48 -07:00
Jeff Brown
b0a57502c6 am 6ec402b5: DO NOT MERGE: Fix input event injection ANRs on UI thread.
Merge commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e' into gingerbread-plus-aosp

* commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e':
  DO NOT MERGE: Fix input event injection ANRs on UI thread.
2010-07-29 13:09:07 -07:00
Jeff Brown
6ec402b5ae DO NOT MERGE: Fix input event injection ANRs on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.

Change-Id: Ia4aa04fd9b75ea2461a844c5b7933c831c1027e6
2010-07-29 12:54:27 -07:00
Jeff Brown
bbda99d208 Fixed StatusBar ANRs due to input event injection on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.

Change-Id: I0464f70ff5cbd519dbb02686b2cb5d810fe7dbb2
2010-07-29 12:19:08 -07:00
Chet Haase
8cde663511 Merge "Make the new android.animation package public" 2010-07-29 10:33:47 -07:00
Chet Haase
3b69b6f0be Make the new android.animation package public
Change-Id: Iff31676f25fc989707a1e17fb172296014a22c27
2010-07-29 09:09:05 -07:00
Brian Carlstrom
5e8a587d49 Tracking merge of dalvik-dev to master
Change-Id: Id4c19401ad0aa238219aaf5d9a20d2889d0a4b18
2010-07-28 23:49:30 -07:00
Adam Powell
a66c7b0456 Add support for setting action bar title/subtitle by resource ID
Change-Id: I91b6f56bd3736fd7cc8b82cbbf0b7be2e1c718e5
2010-07-28 18:02:48 -07:00
Chet Haase
f54a8d7c47 Adding xml declarations for new animation framework
Change-Id: Ic789e47790cf24d1c4b3bcbe9048b992ab93517b
2010-07-28 17:22:14 -07:00
Brett Chabot
2af53220c9 am 6487ade9: am 5f866a4a: Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit '6487ade97ae4ad801681c866c846ed8862454ec4'

* commit '6487ade97ae4ad801681c866c846ed8862454ec4':
  Make FrameworkCoreHostTests use ddmlib-prebuilt.
2010-07-28 17:14:29 -07:00