13946 Commits

Author SHA1 Message Date
Mike Lockwood
bdb05df757 MediaStore: Add helper method to create Uri for querying genre for an audio file
Change-Id: Ic08260854ef2555682c1a169e7ceb9ecc91628c6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-27 13:16:43 -04:00
Fabrice Di Meglio
e6147f0c4b am 514a455f: am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Merge commit '514a455f2a63d6b3366b848a585d99e8680f69aa'

* commit '514a455f2a63d6b3366b848a585d99e8680f69aa':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
2010-09-27 02:36:40 -07:00
Fabrice Di Meglio
514a455f2a am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Merge commit '28fa220c8da1ea2933ac96595516d1efa545c1ea' into gingerbread-plus-aosp

* commit '28fa220c8da1ea2933ac96595516d1efa545c1ea':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
2010-09-27 02:27:08 -07:00
Fabrice Di Meglio
28fa220c8d Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread 2010-09-27 02:16:01 -07:00
Joe Onorato
992d25bd09 Merge "Implement disable() on the status bar." 2010-09-26 19:09:12 -07:00
Joe Onorato
091e1b8a86 Implement disable() on the status bar.
This includes adding the new DISABLE_NAVIGATION flag.

Bug: 3000770
Change-Id: I6d1c3586198e13e06b5d26e8b23a9495dc4ba02e
2010-09-26 19:07:51 -07:00
Romain Guy
1f0d3963d6 Merge "Adding display lists to the GL renderer (checkpoint.)" 2010-09-26 18:42:04 -07:00
Romain Guy
4aa90573bb Adding display lists to the GL renderer (checkpoint.)
Change-Id: Iaa49757600a53b39369dbb23f8c3feab282518e6
2010-09-26 18:40:37 -07:00
Mindy Pereira
560ba6e1a9 am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Merge commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f' into gingerbread-plus-aosp

* commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f':
  DO NOT MERGE. Only 1 edge glow should be growing at a time.
2010-09-26 18:37:04 -07:00
Mindy Pereira
08c09b0f84 Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread 2010-09-26 18:16:26 -07:00
Mindy Pereira
7d4995d250 DO NOT MERGE. Only 1 edge glow should be growing at a time.
When a user action starts a new edge glow (on pull or absorb), cause
the edge glow on the opposite side to decay.
Fixes b/ star  3028395  Yellow color bar is displayed when user reaches the end of the message and keeps scrolling in Gmail.

Change-Id: Id06e00d1843b0467f6f9149c22b233e639fc55ac
2010-09-26 18:13:56 -07:00
Amith Yamasani
68c3099922 Merge "Make the headers pane disappear in no-headers mode, not just the ListView." 2010-09-26 13:51:59 -07:00
Amith Yamasani
05fbc31ed9 Make the headers pane disappear in no-headers mode, not just the ListView. 2010-09-26 13:29:01 -07:00
Daisuke Miyakawa
b643cbe558 am e0998604: Add necessary logic removed during backport
Merge commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1' into gingerbread-plus-aosp

* commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1':
  Add necessary logic removed during backport
2010-09-26 13:12:55 -07:00
Chet Haase
0e0590bf3c bug fixes in animation classes
Change-Id: I5465bc95032c94851b8cf4e4db3477f546e8b0d1
2010-09-26 13:05:09 -07:00
Daisuke Miyakawa
e0998604df Add necessary logic removed during backport
Makes importer import contcats into an appropriate group.
Without this logic, all imported contacts are stored in
"Other Groups".

This logic is removed in my previous submit, while
it shouldn't be.

Bug: 3036599
Change-Id: Ic1dc7253d807fbde4352afe2082984c3b7227267
2010-09-26 12:21:33 -07:00
Jean-Baptiste Queru
79d716f7de am 74a8df20: am dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Merge commit '74a8df2026514025b186aba80a810a03377a80e9'

* commit '74a8df2026514025b186aba80a810a03377a80e9':
  Fix if ACTION_DOWN and lost focus time too close, it will become long press.
2010-09-26 08:44:07 -07:00
Jean-Baptiste Queru
74a8df2026 am dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Merge commit 'dcfb271b7fa364d567ffd7c495b2baa28a755251' into gingerbread-plus-aosp

* commit 'dcfb271b7fa364d567ffd7c495b2baa28a755251':
  Fix if ACTION_DOWN and lost focus time too close, it will become long press.
2010-09-26 08:38:59 -07:00
Romain Guy
1c1797acff Merge "Add debug mode to measure performance." 2010-09-24 18:45:13 -07:00
Romain Guy
e2d345ea67 Add debug mode to measure performance.
Change-Id: I9d4c84034dc200b99c8266165942a7cdbcb5c0c5
2010-09-24 18:39:22 -07:00
Dianne Hackborn
c388844d50 am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp

* commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a':
  DO NOT MERGE.  Fix issue #3000764: API REVIEW: android.R.*
2010-09-24 18:05:14 -07:00
Dianne Hackborn
234e42df5f DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Not going out in GB.

Change-Id: I9d4f5938ec7d2a54c0f72b8eb5a177ee66f12146
2010-09-24 18:00:47 -07:00
Winson Chung
086b1e9fc2 Merge "Re-architecting RemoteViewsAdapter internals due to new constraints." 2010-09-24 17:03:16 -07:00
Winson Chung
3ec9a45c36 Re-architecting RemoteViewsAdapter internals due to new constraints.
- Respecting the AdapterView/Adapter contract using FrameLayout notification to update individual items
- Initial changes to allow for keeping (currently bitmap only) memory in check when loading numerous RemoteViews
- Fixing issue with leaking activities due to extra service connection references
- Fixing issue with multiple RemoteViewsAdapters being set on the same AdapterView
- Fixing small issue with StackView sometimes requesting indices out of bounds
- Removing background loading, reverting to previous message-queuing method (seems to be performant now)

Change-Id: I42313767aa791dfe35c247c97ae5d64389e6bb4c
2010-09-24 17:00:30 -07:00
Patrick Dubroy
a9cf44942b am 88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread
Merge commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f' into gingerbread-plus-aosp

* commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f':
  do not merge - Asset update (pass #3)
2010-09-24 17:00:19 -07:00
Patrick Dubroy
88aa072aab Merge "do not merge - Asset update (pass #3)" into gingerbread 2010-09-24 16:57:46 -07:00
Patrick Dubroy
cc7239b008 do not merge - Asset update (pass #3)
- Updated network status icons & unlock screen

Change-Id: I429ea4bb6090acde1949023e82897712d9fdc924
2010-09-24 16:53:18 -07:00
Steve Howard
e9d51c4e88 am ffe47726: am e78fc18b: Intent action to launch downloads UI.
Merge commit 'ffe477263c503ce75d609d5360cf5e0c72a1363f'

* commit 'ffe477263c503ce75d609d5360cf5e0c72a1363f':
  Intent action to launch downloads UI.
2010-09-24 16:02:45 -07:00
Dianne Hackborn
405e012681 am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit 'deaa8ff1b10d38add4f7c276e7be2ffc19359a14'

* commit 'deaa8ff1b10d38add4f7c276e7be2ffc19359a14':
  Some debugging support.
2010-09-24 15:58:25 -07:00
Eric Laurent
a7936a5d6d am f3ae63ee: am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7'

* commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7':
  fix problem in AudioEffect JNI setup.
2010-09-24 15:57:44 -07:00
Steve Howard
ffe477263c am e78fc18b: Intent action to launch downloads UI.
Merge commit 'e78fc18b339bfe2915e61aef2013a17f0a9ede33' into gingerbread-plus-aosp

* commit 'e78fc18b339bfe2915e61aef2013a17f0a9ede33':
  Intent action to launch downloads UI.
2010-09-24 15:51:50 -07:00
Steve Howard
e78fc18b33 Intent action to launch downloads UI.
Change-Id: Ifd21b9b916479062d51e60108d16ce3f46b453a5
2010-09-24 15:43:51 -07:00
Dianne Hackborn
deaa8ff1b1 am a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503' into gingerbread-plus-aosp

* commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503':
  Some debugging support.
2010-09-24 15:32:51 -07:00
Dianne Hackborn
a7ef18fca5 Merge "Some debugging support." into gingerbread 2010-09-24 15:28:34 -07:00
Patrick Scott
a0b49cfc0c am 888bcdbe: am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '888bcdbeca34819c07d7dc06dc03d91207aea0c0'

* commit '888bcdbeca34819c07d7dc06dc03d91207aea0c0':
  Add new Alarm provider class for setting an alarm.
2010-09-24 15:22:49 -07:00
Robert Greenwalt
253ce31960 Merge "resolved conflicts for merge of 2d457a32 to master" 2010-09-24 14:48:25 -07:00
Robert Greenwalt
f333123d50 resolved conflicts for merge of 2d457a32 to master
Change-Id: I08fc7881010083407a102f471483cd6d5b9774b4
2010-09-24 14:47:06 -07:00
Eric Laurent
f3ae63eef2 am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp

* commit '52f58e96a723a56e6619c237c814a07503745de9':
  fix problem in AudioEffect JNI setup.
2010-09-24 13:46:36 -07:00
Eric Laurent
2fb43ef8c0 fix problem in AudioEffect JNI setup.
There is a problem in AudioEffect and Visualizer native_setup() methods
that causes a crash in the application after the mediaserver process
has crashed and restarted.
The problem is that the native AudioEffect/Visualizer constructor is
called while the JNI is in critical state after calling
GetPrimitiveArrayCritical(). As the mediaserver process just restarted, the
first call to AudioSystem will cause the binder IAudioflinger interface to
be reteived and a callback send to AudioSystem JNI to clear the mediaserver
error state. This will call env->FindClass() and crash due to the JNI being
in critical state.

Also fixed a similar problem in AudioTrack JNI

Change-Id: I4a9026a3e26c7f78d9b4b4bec1aac90fbee2ab62
2010-09-24 13:18:14 -07:00
Dianne Hackborn
f123e49bf0 Some debugging support.
- New feature to "am monitor" to have it automatically launch
  gdbserv for you when a crash/ANR happens, and tell you how to
  run the client.

- Update dumpstate to match new location of binder debug logs

- Various commented out logs that are being used to track down
  issues.

Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
2010-09-24 13:11:55 -07:00
Eric Fischer
322ca29137 Import revised translations.
Change-Id: I41682cf0772a535f9925e134a3e87c3a00a214d1
2010-09-24 12:24:01 -07:00
Patrick Scott
888bcdbeca am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp

* commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
  Add new Alarm provider class for setting an alarm.
2010-09-24 11:36:51 -07:00
Patrick Scott
3ae249dc6a Merge "Add new Alarm provider class for setting an alarm." into gingerbread 2010-09-24 11:34:10 -07:00
Robert Greenwalt
2d457a32a6 am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp

* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
  Move long Connectivity tasks to handler thread.
2010-09-24 11:09:29 -07:00
Eric Fischer
f2af2d924d am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp

* commit '4318ab058629b701e225bb7ead9dd2b229c9354b':
  Import revised translations.  DO NOT MERGE
2010-09-24 11:05:07 -07:00
Patrick Scott
a73c4b082c Add new Alarm provider class for setting an alarm.
The new class provides static variables for creating an intent to broadcast to
applications implementing the alarm clock.  A new permission has been added and
applications are recommended to require this permission if accepting the set
alarm broadcast.

Change-Id: I7b1014acdc54371cbda19bcf9b5c395b647aa413
2010-09-24 13:52:14 -04:00
Mike Lockwood
ab853b39be Merge "Add constant for SDCARD_RW group ID." 2010-09-24 10:45:38 -07:00
Robert Greenwalt
8f97fe551e Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Eric Fischer
0e5467f51f Import revised translations. DO NOT MERGE
Change-Id: Iec41808d7f6514cffc67a91e1b243fa063f04089
2010-09-24 10:21:31 -07:00
Vasu Nori
5a049b0fff temporarily comment out dbstats info code when doing adb bugreport
could this be causing bugs like bug:2990184

Change-Id: I315aaa93c1d71922ad4bc96ba0a14a9261a6f39a
2010-09-24 09:26:43 -07:00