Commit Graph

11479 Commits

Author SHA1 Message Date
Kenny Root
cc8f44bc81 am e7dd4e38: am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d'

* commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d':
  Use buffered I/O during certificate parsing
2010-09-27 20:32:56 -07:00
Dianne Hackborn
64bbbb471e resolved conflicts for merge of a8bce7c8 to master
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
2010-09-27 20:25:20 -07:00
Vasu Nori
9b8a51e9d3 Merge "fix this: closing database twice fails with IllegalStateException" 2010-09-27 18:29:18 -07:00
Vasu Nori
587423afb5 fix this: closing database twice fails with IllegalStateException
Change-Id: Idda35e49d539845099b377872f9a6f0e0caa4626
2010-09-27 18:26:25 -07:00
Dianne Hackborn
cca1f0e347 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-27 18:05:44 -07:00
Adam Powell
c63806d852 Holo themes and assets in progress
Change-Id: Ic10480dc1c771d0ccd10f1d4014c945480fd6c0d
2010-09-27 17:10:30 -07:00
Irfan Sheriff
1beeab70a2 Merge "use hostname when address null ProxyProperties parcelling" 2010-09-27 16:24:23 -07:00
Joe Onorato
710e049a6e Merge "Hide the "Clear all" button in the notification panel if there are no clearable notifications." 2010-09-27 15:54:55 -07:00
Joe Onorato
5dd1169ae9 Hide the "Clear all" button in the notification panel if there are no clearable notifications.
Change-Id: I7145036724939220e1f23fb91c62027b28663c20
2010-09-27 15:34:04 -07:00
Jeff Brown
464fb74e28 am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919'

* commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919':
  Add suuport for splitting touch events across windows.
2010-09-27 14:40:38 -07:00
Vasu Nori
8fef1b7520 reduce synchronization on SQLiteDatabase wherever possible
Change-Id: Ibb8617667752eab45d29b01d332b68c3547bdea8
2010-09-27 14:05:09 -07:00
Vasu Nori
ffe06127f6 remove public API setConnectionPoolSize()
because connection pool size is now settable by modifying config.xml
of the device.

Change-Id: I973cc11d7dc10c8d95ab83e2f691068f6019fa33
2010-09-27 13:30:49 -07:00
Kenny Root
e7dd4e38c4 am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit '04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp

* commit '04a426f5b50a628fb73bc29b003b0e5bece17c27':
  Use buffered I/O during certificate parsing
2010-09-27 12:48:05 -07:00
Kenny Root
04a426f5b5 Merge "Use buffered I/O during certificate parsing" into gingerbread 2010-09-27 12:45:44 -07:00
Dianne Hackborn
a8bce7c8ac am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp

* commit 'd8691d73d158acd9ffc63748126e822afd656707':
  Allow all apps to call ContentResolver.getType().
2010-09-27 12:45:31 -07:00
Dianne Hackborn
d8691d73d1 Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 2010-09-27 12:42:34 -07:00
Jeff Brown
9785bf0f2b am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp

* commit '14a288da6a372230d9af41da12241fe500eec837':
  Add suuport for splitting touch events across windows.
2010-09-27 12:37:03 -07:00
Jeff Brown
14a288da6a Merge "Add suuport for splitting touch events across windows." into gingerbread 2010-09-27 12:33:14 -07:00
Irfan Sheriff
798ffa1237 use hostname when address null ProxyProperties parcelling
In ProxyProperties parcel, use toString so that hostname
is used when address is null

Change-Id: I4813dbdaf3c4a7bb404edf960d0f990c732ec0b8
2010-09-27 12:16:11 -07:00
Dan Morrill
2b0fa71c1a am c6581a10: am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details
Merge commit 'c6581a1046b062d0e06e50e9b09e6c12a8e54efc'

* commit 'c6581a1046b062d0e06e50e9b09e6c12a8e54efc':
  Adding a feature to indicate that the device possesses low-latency audio.
2010-09-27 11:45:51 -07:00
Dan Morrill
c6581a1046 am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d
Merge commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp

* commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b':
  Adding a feature to indicate that the device possesses low-latency audio.
2010-09-27 10:39:19 -07:00
Dan Morrill
4e9751f077 Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread 2010-09-27 10:30:41 -07:00
Huahui Wu
a6c2ddbf2a Merge "Bug 2372180: pass multi-touch events from browser to webkit. Since the UI uses multi-touch for zooming, the event is passed to webkit only when the webpage doesn't allow zooming. 1. Updated the data structure TouchEventData in WebViewCore.java to take multiple points and used it everywhere. 2. Added a passMultiTouchToWebkit() function to do what its name means. 3. Added the multi-point touch support to dumprendertree." 2010-09-27 10:22:41 -07:00
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
Kenny Root
d63f7dbf5d Use buffered I/O during certificate parsing
The PackageParser was using a raw InputStream instead of wrapping it in
a BufferedInputStream which could degrade performance.

Change-Id: I15c86c3ead363ddbadf4ae27e011feda90fcc579
2010-09-27 08:09:26 -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
Jeff Brown
01ce2e9eee Add suuport for splitting touch events across windows.
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time.  Could be used for
other things later.

Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.

Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
2010-09-26 22:20:12 -07:00
Dianne Hackborn
8313fc7e94 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-26 21:31:47 -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
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
Dan Morrill
898e1e8860 Adding a feature to indicate that the device possesses low-latency audio.
The specific criteria for low-latency audio are defined in the CDD, but since
that hasn't yet been settled for Gingerbread, this change doesn't go into
details. We can do a docs change later once GB CDD is final.

Change-Id: Ic5ad9d04e8ecd78c81b6f09439affec6bf8cb9b2
2010-09-26 17:28:30 -07:00
Huahui Wu
41865f4b0c Bug 2372180: pass multi-touch events from browser to webkit.
Since the UI uses multi-touch for zooming, the event is passed to webkit
only when the webpage doesn't allow zooming.
1. Updated the data structure TouchEventData in WebViewCore.java
   to take multiple points and used it everywhere.
2. Added a passMultiTouchToWebkit() function to do what its name means.
3. Added the multi-point touch support to dumprendertree.

Change-Id: Iafc1aa7b21a587ad26efd2f124b9a66316297ab8
2010-09-26 16:26:38 -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
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
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
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