Commit Graph

18489 Commits

Author SHA1 Message Date
Dianne Hackborn
0a795767b1 Merge "Add new DialogFragment class." 2010-07-24 11:44:04 -07:00
Romain Guy
a14d7cd8f7 Merge "Add text alignment support to drawText()." 2010-07-23 18:56:32 -07:00
Jean-Baptiste Queru
40cff52d07 am 1b05a79f: am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."
Merge commit '1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae'

* commit '1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae':
  Enables writing to USIM phonebook (fixes issue 8976).
2010-07-23 17:52:30 -07:00
Jean-Baptiste Queru
c2c0f38d81 am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."
Merge commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2' into gingerbread-plus-aosp

* commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2':
  Enables writing to USIM phonebook (fixes issue 8976).
2010-07-23 17:48:11 -07:00
Jean-Baptiste Queru
ec5506e87a Merge "Enables writing to USIM phonebook (fixes issue 8976)." 2010-07-23 17:35:13 -07:00
Jean-Baptiste Queru
532948cbc3 am 8a13d4e3: am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk"
Merge commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6'

* commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6':
  dependent change for "parse instrumentation result bundles" in sdk
2010-07-23 15:34:50 -07:00
Jean-Baptiste Queru
71f592ceca am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk"
Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp

* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
  dependent change for "parse instrumentation result bundles" in sdk
2010-07-23 15:32:45 -07:00
Jean-Baptiste Queru
0e81e1b726 Merge "dependent change for "parse instrumentation result bundles" in sdk" 2010-07-23 15:24:55 -07:00
Jean-Baptiste Queru
5ac6e1e022 am 5b0f030d: resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp
Merge commit '5b0f030d0bfdf7003e74b24da8c4379c74447380'

* commit '5b0f030d0bfdf7003e74b24da8c4379c74447380':
  Remove compilation warnings by removing illegal characters
2010-07-23 15:04:28 -07:00
Alex Sakhartchouk
2f31238dfe Merge "Updating parts of font cache as needed instead of the entire map." 2010-07-23 15:00:24 -07:00
Jean-Baptiste Queru
66282a6a09 resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp
Change-Id: Ief79eaa532b583d9608701d48464b7afdc493bac
2010-07-23 14:15:01 -07:00
Romain Guy
410d0ea5a4 Merge "Remove compilation warnings by removing illegal characters" 2010-07-23 14:05:40 -07:00
Daniel Sandler
4d04438541 Merge "Improvements to the system bar:" 2010-07-23 12:00:11 -07:00
Ben Komalo
a06d2cc34e Merge "Release resources for a previously loaded cursor if a new one comes in." 2010-07-23 11:59:15 -07:00
Chet Haase
9ef6882fe0 Merge "Sequencer now sends out onAnimationEnd() event correctly." 2010-07-23 11:23:32 -07:00
Eric Laurent
dba9376da1 am 08f2b10c: am 021697ad: Audio effects: lvm bundle wrapper update after first integration tests.
Merge commit '08f2b10c4b2e7fc1c666cc1d896e227289206b24'

* commit '08f2b10c4b2e7fc1c666cc1d896e227289206b24':
  Audio effects: lvm bundle wrapper update after first integration tests.
2010-07-23 01:06:12 -07:00
Eric Laurent
3987726555 am 021697ad: Audio effects: lvm bundle wrapper update after first integration tests.
Merge commit '021697ad3d4ef981d0deae1fa223ed06f30df738' into gingerbread-plus-aosp

* commit '021697ad3d4ef981d0deae1fa223ed06f30df738':
  Audio effects: lvm bundle wrapper update after first integration tests.
2010-07-23 01:03:06 -07:00
Romain Guy
a8c4455caf Merge "Cleanup, added properties for the FontRenderer." 2010-07-23 00:29:22 -07:00
Mathias Agopian
d671e2b957 am 1db0e88e: am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
Merge commit '1db0e88e60ca4f99edff149fe2ab8499e749df47'

* commit '1db0e88e60ca4f99edff149fe2ab8499e749df47':
  Fix a memory corruption when writting Sensor into a parcel
2010-07-22 20:11:54 -07:00
Mathias Agopian
84101fe028 am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
Merge commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7' into gingerbread-plus-aosp

* commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7':
  Fix a memory corruption when writting Sensor into a parcel
2010-07-22 20:09:09 -07:00
Mathias Agopian
625177aa35 Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread 2010-07-22 20:07:01 -07:00
Irfan Sheriff
0da155aeb4 Merge "Fix wifi status icon" 2010-07-22 18:57:55 -07:00
Mathias Agopian
d03d9ced3f Fix a memory corruption when writting Sensor into a parcel
Change-Id: I03f703ae2224f43924031bfea4c68aa979bb9f05
2010-07-22 18:57:41 -07:00
Romain Guy
084fb9baaf Merge "Add a way to query GL extensions." 2010-07-22 18:53:03 -07:00
Mathias Agopian
710efe8c61 am f595a8f7: am 19f082eb: Merge "filter sensor event by connection" into gingerbread
Merge commit 'f595a8f7a90bc7f3b947b05cfbcd209d3e94ba89'

* commit 'f595a8f7a90bc7f3b947b05cfbcd209d3e94ba89':
  filter sensor event by connection
2010-07-22 17:29:04 -07:00
Mathias Agopian
805b620794 am 19f082eb: Merge "filter sensor event by connection" into gingerbread
Merge commit '19f082ebe859da5191ccab5f38058513c32b3d05' into gingerbread-plus-aosp

* commit '19f082ebe859da5191ccab5f38058513c32b3d05':
  filter sensor event by connection
2010-07-22 17:26:17 -07:00
Mathias Agopian
84a7d07f45 Merge "filter sensor event by connection" into gingerbread 2010-07-22 17:23:17 -07:00
James Dong
521be60f8b am 9bc4dc11: am 53d4e0d5: Allows the authoring engine to skip frame.
Merge commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae'

* commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae':
  Allows the authoring engine to skip frame.
2010-07-22 16:28:26 -07:00
James Dong
be9a667bb2 am 53d4e0d5: Allows the authoring engine to skip frame.
Merge commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba' into gingerbread-plus-aosp

* commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba':
  Allows the authoring engine to skip frame.
2010-07-22 16:25:17 -07:00
Jean-Baptiste Queru
a93772164d am 83a23630: am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Merge commit '83a236303438453740d5db41b0d017be9e5d56c1'

* commit '83a236303438453740d5db41b0d017be9e5d56c1':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:18:35 -07:00
Jean-Baptiste Queru
5eb81846a0 am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Merge commit 'dd29904638fb36cd5585560e83367d1f5565cc4c' into gingerbread-plus-aosp

* commit 'dd29904638fb36cd5585560e83367d1f5565cc4c':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:14:18 -07:00
Jean-Baptiste Queru
b8bd449144 Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver" 2010-07-22 15:55:31 -07:00
Winson Chung
ed23d63cf1 Merge "Fixing indexing issue causing certain items not to load. Performance improvements + testing temporary loading scheme." 2010-07-22 15:41:29 -07:00
Jason Sams
d67ee81ead Merge "Minor ImageProcessing script optimization to make it a better FP benchmark." 2010-07-22 15:11:52 -07:00
Jason Sams
46093c5521 Merge "Update filltest." 2010-07-22 15:11:08 -07:00
Adam Cohen
4c993de45f Merge "Fixing build breakage (current.xml)" 2010-07-22 14:54:46 -07:00
Mathias Agopian
9e472f47e9 am 422e700e: am db3eb355: Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread
Merge commit '422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a'

* commit '422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a':
  propagate sensor event rate properly to the sensor HAL
2010-07-22 14:45:59 -07:00
Mathias Agopian
6c1ed6522d am db3eb355: Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread
Merge commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa' into gingerbread-plus-aosp

* commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa':
  propagate sensor event rate properly to the sensor HAL
2010-07-22 14:42:12 -07:00
Mathias Agopian
f35ed885c1 Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread 2010-07-22 14:38:49 -07:00
Andreas Huber
7840d8cbeb am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread
Merge commit 'b72d3180dc8d41d6269664bea808b04410bbe40f'

* commit 'b72d3180dc8d41d6269664bea808b04410bbe40f':
  Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
2010-07-22 13:57:39 -07:00
Andreas Huber
98343e73aa am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread
Merge commit '81046c8c42ff3b630c6496deafd44f2a07a25463' into gingerbread-plus-aosp

* commit '81046c8c42ff3b630c6496deafd44f2a07a25463':
  Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
2010-07-22 13:54:47 -07:00
Andreas Huber
e99010aae2 Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread 2010-07-22 13:47:41 -07:00
Romain Guy
e92bec26c6 Merge "Add support for text culling." 2010-07-22 13:09:14 -07:00
Jean-Baptiste Queru
8975b7a0f2 am 1cb7b2e9: am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
Merge commit '1cb7b2e961fdbdfc39013846e97a918be2a14e07'

* commit '1cb7b2e961fdbdfc39013846e97a918be2a14e07':
  Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
2010-07-22 12:47:04 -07:00
Jean-Baptiste Queru
cdf63e92cf am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
Merge commit 'e7486695ced2dd135f6e2223b582adde4155b917' into gingerbread-plus-aosp

* commit 'e7486695ced2dd135f6e2223b582adde4155b917':
  Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
2010-07-22 12:43:07 -07:00
Jean-Baptiste Queru
661d13b9e5 Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE" 2010-07-22 12:22:56 -07:00
Jean-Baptiste Queru
1f0ad8d890 am 4ef923d8: am b42aa98d: Merge "Correct VM number updation during MBDN refresh."
Merge commit '4ef923d849ec74c7208eaf650b169b5459276fc2'

* commit '4ef923d849ec74c7208eaf650b169b5459276fc2':
  Correct VM number updation during MBDN refresh.
2010-07-22 11:50:55 -07:00
Jean-Baptiste Queru
72d60ccc35 am b42aa98d: Merge "Correct VM number updation during MBDN refresh."
Merge commit 'b42aa98d44f1ad22746005264274220770de2756' into gingerbread-plus-aosp

* commit 'b42aa98d44f1ad22746005264274220770de2756':
  Correct VM number updation during MBDN refresh.
2010-07-22 11:47:26 -07:00
Adam Powell
02398a047a Merge "Make finish() a no-op on a context mode that is not active." 2010-07-22 11:38:56 -07:00
Jean-Baptiste Queru
11b9e7d766 Merge "Correct VM number updation during MBDN refresh." 2010-07-22 11:38:05 -07:00