OSDN Git Service
Gil Dobjanschi [Wed, 6 Oct 2010 17:25:20 +0000 (10:25 -0700)]
Merge "Added the video editor to the media items and audio track constructors."
Fred Quintana [Wed, 6 Oct 2010 17:03:19 +0000 (10:03 -0700)]
Merge "Make a separate active sync queue for initialization and regular syncs."
Gil Dobjanschi [Wed, 6 Oct 2010 16:54:34 +0000 (09:54 -0700)]
Added the video editor to the media items and audio track constructors.
Change-Id: I5db229d28c28e17b487257a9c4ed8c5fb7570a8d
Gil Dobjanschi [Wed, 6 Oct 2010 16:46:09 +0000 (09:46 -0700)]
Merge "Adjust start time and duration for overlays and effects."
Steve Block [Wed, 6 Oct 2010 15:30:13 +0000 (08:30 -0700)]
Merge "Make sure that we send the DeviceOrientation error event only once"
Steve Block [Wed, 25 Aug 2010 10:56:09 +0000 (11:56 +0100)]
Make sure that we send the DeviceOrientation error event only once
Change-Id: Iff095ad4d282635c567b0c85a286056e23ca38e3
Brian Carlstrom [Wed, 6 Oct 2010 05:23:41 +0000 (22:23 -0700)]
Fix instance count to be long
Change-Id: I88b17c4ff17a04db6e931f9b25885bdf05d4453c
Brian Carlstrom [Wed, 6 Oct 2010 04:34:06 +0000 (21:34 -0700)]
Adding android.os.Debug.countInstancesOfClass
- Debug.countInstancesOfClass is just a wrapper on
dalvik.system.VMDebug.countInstancesOfClass to avoid code from
depending on the dalvik classes directly
- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
and ViewDebug are converted to the new Debug.countInstancesOfClass
- Existing use of OpenSSLSocketImpl.instanceCount, which is being
removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)
Bug:
3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
Robert Greenwalt [Wed, 6 Oct 2010 02:14:45 +0000 (19:14 -0700)]
Merge "Turn on some debugging info"
Robert Greenwalt [Wed, 6 Oct 2010 02:12:26 +0000 (19:12 -0700)]
Turn on some debugging info
bug:
3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
James Dong [Wed, 6 Oct 2010 02:01:10 +0000 (19:01 -0700)]
Merge "Use setVideoSize API in StagefrightRecorder"
Romain Guy [Wed, 6 Oct 2010 01:16:35 +0000 (18:16 -0700)]
Merge "Optimize saveLayer() when the clip flag is set."
Romain Guy [Wed, 6 Oct 2010 01:14:38 +0000 (18:14 -0700)]
Optimize saveLayer() when the clip flag is set.
This speeds up applications, especially Launcher.
Dianne Hackborn [Wed, 6 Oct 2010 00:54:35 +0000 (17:54 -0700)]
Merge "Implement permission granting in clipboard."
Vasu Nori [Wed, 6 Oct 2010 00:46:36 +0000 (17:46 -0700)]
Merge "fix broken build"
Vasu Nori [Wed, 6 Oct 2010 00:45:37 +0000 (17:45 -0700)]
fix broken build
Change-Id: Ic00e8b98780d48928e05ee27f855e8211fb1ec47
Gil Dobjanschi [Wed, 6 Oct 2010 00:17:16 +0000 (17:17 -0700)]
Adjust start time and duration for overlays and effects.
Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
Fred Quintana [Tue, 5 Oct 2010 21:00:39 +0000 (14:00 -0700)]
Make a separate active sync queue for initialization and regular syncs.
This entails allowing multiple syncs to happen in parallel, with
different limits for regular and initialization syncs.
Change-Id: I0e47c6515af5c98faf899f91855b342b0d0c708c
Vasu Nori [Wed, 6 Oct 2010 00:08:53 +0000 (17:08 -0700)]
Merge "annotate some tests large - just in case they take longer. bug:
3066136"
Kenny Root [Wed, 6 Oct 2010 00:02:42 +0000 (17:02 -0700)]
am
bfa33b94: am
f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Merge commit '
bfa33b9484e2c0a019ab81f30261b9696df23a9b'
* commit '
bfa33b9484e2c0a019ab81f30261b9696df23a9b':
Use pread() in ZipFileRO for Linux
Gilles Debunne [Wed, 6 Oct 2010 00:02:27 +0000 (17:02 -0700)]
am
b3e95d9f: am
c37eac24: Restored ic_dialog_menu_generic asset.
Merge commit '
b3e95d9fc4365d20a39aa3ef61da537dabf5b800'
* commit '
b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
Restored ic_dialog_menu_generic asset.
Vasu Nori [Tue, 5 Oct 2010 23:53:57 +0000 (16:53 -0700)]
annotate some tests large - just in case they take longer. bug:
3066136
Change-Id: I89ab0454f592748f971b678a3ae23724eb6fc2e5
Vasu Nori [Tue, 5 Oct 2010 23:53:24 +0000 (16:53 -0700)]
Merge "turn off some useless messages"
Vasu Nori [Tue, 5 Oct 2010 23:50:51 +0000 (16:50 -0700)]
turn off some useless messages
Change-Id: I5ed5696cd052b70e7cf7b872205470cd56fada90
Gilles Debunne [Tue, 5 Oct 2010 23:16:20 +0000 (16:16 -0700)]
am
8556efe5: (-s ours) am
a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Merge commit '
8556efe5a34d8fc6ed99f1fdae60fa41b7647920'
* commit '
8556efe5a34d8fc6ed99f1fdae60fa41b7647920':
DO NOT MERGE. Select word no longer selects spaces between words.
Scott Main [Tue, 5 Oct 2010 23:15:44 +0000 (16:15 -0700)]
am
196894cd: am
c692792e: am
46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '
196894cdcc6883ed141ec0f6f2f577dbc613e08f'
* commit '
196894cdcc6883ed141ec0f6f2f577dbc613e08f':
docs: update homepage with more countries for market announcement
Alex Sakhartchouk [Tue, 5 Oct 2010 22:32:38 +0000 (15:32 -0700)]
Merge "Adding average fps counter. Removing rsLight from libRS"
Chet Haase [Tue, 5 Oct 2010 22:21:34 +0000 (15:21 -0700)]
Merge "Adding next/prev to fragment animations and to PreferenceActivity"
Scott Main [Tue, 5 Oct 2010 22:19:26 +0000 (15:19 -0700)]
Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced."
Scott Main [Tue, 5 Oct 2010 22:17:40 +0000 (15:17 -0700)]
am
fc7f3919: am
b3a5b85a: am
6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '
fc7f39196be7e7e741ece79b4b551c52cdb67f0d'
* commit '
fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
James Dong [Tue, 5 Oct 2010 22:17:29 +0000 (15:17 -0700)]
am
6a02ba01: am
b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit '
6a02ba0100e030e0b8bf2b6f195eabac1f1812db'
* commit '
6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
Resilent media time stamp adjustment
Gilles Debunne [Tue, 5 Oct 2010 22:17:17 +0000 (15:17 -0700)]
am
6f4f0106: am
b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
Merge commit '
6f4f01062bc78ae765c970e8796b8dbef432f8a4'
* commit '
6f4f01062bc78ae765c970e8796b8dbef432f8a4':
Removed icon in Alert dialog header.
Adam Powell [Tue, 5 Oct 2010 22:17:05 +0000 (15:17 -0700)]
am
dcbf315e: am
368733b2: Remove overscroll_edge.png from drawable/
Merge commit '
dcbf315e83234623622bd268a823ecc4dc49e375'
* commit '
dcbf315e83234623622bd268a823ecc4dc49e375':
Remove overscroll_edge.png from drawable/
Adam Powell [Tue, 5 Oct 2010 22:16:48 +0000 (15:16 -0700)]
am
b8d3bc5c: (-s ours) am
103f59ba: Merge "Fix bug
3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit '
b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'
* commit '
b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
Fix bug
3052686 - ScrollView padding treated incorrectly
Chet Haase [Tue, 5 Oct 2010 21:30:51 +0000 (14:30 -0700)]
Adding next/prev to fragment animations and to PreferenceActivity
Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would
either be placed onto or taken off of the stack, or would just replace the current
fragment. The new next/prev capability gives the ability to run a transition that is
specific to next/previous operations, such as navigating forward and backward in a list.
New next/prev animations may be associated with a fragment replace operation to get the
next/prev animations built into the system (next animates things up, prev animates them
down).
Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
Scott Main [Mon, 4 Oct 2010 23:03:15 +0000 (16:03 -0700)]
docs: Rewrite of App Fundamentals.. Part 1.
This introduces two new docs:
Activities
Provides a fundamental introduction to how activities work, including
the basics about layout, manifest entries, starting activies, getting results,
and the complete discussion about the lifecycle (which used to be in the
fundamentals.jd document under "Component Lifecycles"), but also now includes more
information about saving instance state (with new diagrams).
Tasks and Back Stack
A large expansion of the material originally presented in the fundamentals.jd
document under "Activities and Tasks". This doc talks all about how tasks and
the back stack work. This content re-organization is important because fragments
can now become a part of the back stack (which is a task-oriented concept), thus,
it's important to separate the task ideas from being tied directly to activities only,
which is how tasks are currently discussed. However, fragments are not yet discussed
here in detail---that will come later when the fragment dev guide is introduced.
Change-Id: I46425b5c2c3b928dc81bafd05a88ad3ea1c5be53
Romain Guy [Tue, 5 Oct 2010 22:00:01 +0000 (15:00 -0700)]
Merge "Add support for paletted textures."
Romain Guy [Tue, 5 Oct 2010 21:58:09 +0000 (14:58 -0700)]
Add support for paletted textures.
Change-Id: I36e6069bd58f78c609cdd1f3e4560c98f128f48e
Dianne Hackborn [Mon, 27 Sep 2010 21:58:44 +0000 (14:58 -0700)]
Implement permission granting in clipboard.
Change-Id: I9a7a949d1aaf4b3beabceaf807fb7d3b040e4ea8
Romain Guy [Tue, 5 Oct 2010 20:44:24 +0000 (13:44 -0700)]
Merge "Code cleanup and disable display lists for now."
Christopher Tate [Tue, 5 Oct 2010 20:43:44 +0000 (13:43 -0700)]
Merge "Make View.DragThumbnailBuilder a static class"
Romain Guy [Tue, 5 Oct 2010 18:49:57 +0000 (11:49 -0700)]
Code cleanup and disable display lists for now.
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
Jason Sams [Tue, 5 Oct 2010 20:35:47 +0000 (13:35 -0700)]
Merge "Implement allocation resizing."
Jason Sams [Tue, 5 Oct 2010 20:32:49 +0000 (13:32 -0700)]
Implement allocation resizing.
Change-Id: Ie38d42419d595cec730a8721cc1321c5edb6b4d6
Alex Sakhartchouk [Tue, 5 Oct 2010 20:23:55 +0000 (13:23 -0700)]
Adding average fps counter.
Removing rsLight from libRS
Change-Id: I8622efd10619dc120d37f3a12122e9c7fc34ff2e
Christopher Tate [Tue, 5 Oct 2010 20:06:41 +0000 (13:06 -0700)]
Make View.DragThumbnailBuilder a static class
It also now uses a WeakReference to the associated View, not a hard
object pointer.
Change-Id: I37e10b3155ee7e089a72bdf050cc2d323794810f
Alex Sakhartchouk [Tue, 5 Oct 2010 20:13:40 +0000 (13:13 -0700)]
Merge "Adding text metrics to renderscript."
Dianne Hackborn [Tue, 5 Oct 2010 19:54:41 +0000 (12:54 -0700)]
am
89230e3b: am
458fc5f5: Merge "Fix issue #
3041660: Camera image flips upside down when rotating device" into gingerbread
Merge commit '
89230e3b7b9ec455373e3f60b62ff65589a9c57d'
* commit '
89230e3b7b9ec455373e3f60b62ff65589a9c57d':
Fix issue #
3041660: Camera image flips upside down when rotating device
Vasu Nori [Tue, 5 Oct 2010 19:27:27 +0000 (12:27 -0700)]
Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db"
Gilles Debunne [Tue, 5 Oct 2010 19:26:22 +0000 (12:26 -0700)]
Merge "resolved conflicts for merge of
8390651c to master"
Gilles Debunne [Tue, 5 Oct 2010 19:11:56 +0000 (12:11 -0700)]
resolved conflicts for merge of
8390651c to master
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
Alex Sakhartchouk [Tue, 5 Oct 2010 18:33:27 +0000 (11:33 -0700)]
Adding text metrics to renderscript.
Change-Id: Ica460525243d714a278e4ad5e436af43e1008e0c
Ficus Kirkpatrick [Tue, 5 Oct 2010 18:33:03 +0000 (11:33 -0700)]
Merge "Reduce log spam."
Ficus Kirkpatrick [Tue, 5 Oct 2010 18:28:23 +0000 (11:28 -0700)]
Reduce log spam.
Remove the WifiService ACTION_BATTERY_CHANGED log message.
Change-Id: Idfcdf1661f9243a9eb043419490a7138533f3357
Adam Cohen [Mon, 4 Oct 2010 20:56:11 +0000 (13:56 -0700)]
Changing AdapterViewAnimator to use the new animation APIs
Change-Id: Ifefb83c391914ac623d75e0faca723b95786861d
Vasu Nori [Tue, 5 Oct 2010 17:48:49 +0000 (10:48 -0700)]
STOPSHIP - add illegalStateException to catch potential deadlocks in db
database lock() should not be called from a synchronized methods
in database layer. add code to check.
this will catch potential deadlock situations sooner
Change-Id: I9d913f5e2af304f4d9ad5b2641c3a768c4bc97f9
Joe Onorato [Tue, 5 Oct 2010 16:37:03 +0000 (12:37 -0400)]
manual merge Merge commit '
77e42376' into work
Conflicts:
packages/SystemUI/res/values/colors.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
Patrick Scott [Tue, 5 Oct 2010 13:30:24 +0000 (09:30 -0400)]
Add postSync so that the chrome stack has access.
Bug:
3053149
Change-Id: I75f5422afcacf4ae70a2aa26188446251d7f84da
satok [Wed, 29 Sep 2010 02:52:06 +0000 (11:52 +0900)]
Add utility of enabled InputMethod settings to InputMethodManagerService
- Add setter of enabled InputMethodSubtypes
- Enabled InputMethods are saved as follows:
-- enabled_inputmethod0;enabled_subtype0;enabled_subtype1:enabled_inputmethod1
- TODO: Fix Settings application to parse new Enabled InputMethod string.
-- Currently IMMS doesn't save InputMethodSubtypes so this will not break Settings application.
Change-Id: Icd0f13de396ce286ff6563e8c2775d53bcdacbf3
Romain Guy [Tue, 5 Oct 2010 03:17:01 +0000 (20:17 -0700)]
Correctly invalidate the drawing cache when an invalidate is requested.
Change-Id: Ic78f85d728a14a9f2e4a1925d46b6db9a204bbb1
Christopher Tate [Tue, 5 Oct 2010 02:40:28 +0000 (19:40 -0700)]
Merge "Refinements to drag/drop"
Gil Dobjanschi [Tue, 5 Oct 2010 02:04:36 +0000 (19:04 -0700)]
Merge "Added mute APIs for MediaVideoItem and AudioTrack"
Gil Dobjanschi [Tue, 5 Oct 2010 01:30:53 +0000 (18:30 -0700)]
Added mute APIs for MediaVideoItem and AudioTrack
Change-Id: I2e4e8b213a5d19f895d9e3431b7d4f1acad70762
Scott Main [Tue, 5 Oct 2010 01:37:40 +0000 (18:37 -0700)]
resolved conflicts for merge of
7008b7c1 to master
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
Christopher Tate [Mon, 4 Oct 2010 21:13:40 +0000 (14:13 -0700)]
Refinements to drag/drop
Thumbnail measurement & drawing has been moved out into a delegate
class called View.DragThumbnailBuilder. This consolidates the
thumbnail-related code as well as ensuring that the drag initiator
does not have to know a priori where to place the thumbnail relative
to the touch point *before* the thumbnail measurement step, as was
previously the case.
startDrag() no longer needs to be told where the current touch point
is at the time the drag is launched.
Drag events are now dispatched only to VISIBLE views.
Dispatch shouldn't double-recycle events any more when the target
window is local to the system process.
Change-Id: I49419103765a0cad2e18ddfcdd6dacb94daf1ff1
Patrick Dubroy [Tue, 5 Oct 2010 01:23:44 +0000 (18:23 -0700)]
am
242fa52b: am
eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
Merge commit '
242fa52bb6d4556c7cb4bcb1880210f076ea7270'
* commit '
242fa52bb6d4556c7cb4bcb1880210f076ea7270':
Fix 2-pixel offset unlock jog tab
Vasu Nori [Tue, 5 Oct 2010 01:10:51 +0000 (18:10 -0700)]
don't print informational messages from sqlite in log
right now, all messages from sqlite are printed in the logfile.
if the error code = 0, then sqlite message is just an informational
message that usually has no meaning to the developers
and ends up confusing the developers.
discard such messages
Change-Id: I961f1b33a745d5e9b20c85ee8a0071c92c253d96
Gil Dobjanschi [Tue, 5 Oct 2010 00:52:43 +0000 (17:52 -0700)]
Merge "Save AudioTrack to XML"
Romain Guy [Tue, 5 Oct 2010 00:24:21 +0000 (17:24 -0700)]
Merge "Remove logs to reduce logcat spam."
Romain Guy [Tue, 5 Oct 2010 00:22:29 +0000 (17:22 -0700)]
Remove logs to reduce logcat spam.
Change-Id: I5fc295b05b5d82bb86827b88e94dd51e8bcdc7d3
Gil Dobjanschi [Tue, 5 Oct 2010 00:20:43 +0000 (17:20 -0700)]
Save AudioTrack to XML
Change-Id: Ie9afe8c620e21e160b56c36f489870db0a3987cc
Chet Haase [Tue, 5 Oct 2010 00:16:03 +0000 (17:16 -0700)]
Merge "Changed LayoutTransition to disable animations when set to null"
Romain Guy [Tue, 5 Oct 2010 00:15:15 +0000 (17:15 -0700)]
Merge "Reorder logs."
Romain Guy [Tue, 5 Oct 2010 00:10:58 +0000 (17:10 -0700)]
Reorder logs.
Change-Id: I4adbd53662e1f509c860898c8ff9d19eaabd6d5b
Kenny Root [Tue, 5 Oct 2010 00:12:10 +0000 (17:12 -0700)]
am
f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Merge commit '
f84a5918f5e0572c0280fa705970ef7459b45393' into gingerbread-plus-aosp
* commit '
f84a5918f5e0572c0280fa705970ef7459b45393':
Use pread() in ZipFileRO for Linux
Kenny Root [Tue, 5 Oct 2010 00:08:26 +0000 (17:08 -0700)]
Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Gilles Debunne [Tue, 5 Oct 2010 00:03:25 +0000 (17:03 -0700)]
am
c37eac24: Restored ic_dialog_menu_generic asset.
Merge commit '
c37eac249719a8f930cb2b9d3c5bdee591018cc5' into gingerbread-plus-aosp
* commit '
c37eac249719a8f930cb2b9d3c5bdee591018cc5':
Restored ic_dialog_menu_generic asset.
Gilles Debunne [Mon, 4 Oct 2010 23:34:53 +0000 (16:34 -0700)]
Restored ic_dialog_menu_generic asset.
Change-Id: I17904a5376b841de72b95b59d0c277c53549f6c7
Chet Haase [Mon, 4 Oct 2010 23:47:19 +0000 (16:47 -0700)]
Changed LayoutTransition to disable animations when set to null
Change-Id: Ic4d67135a273ea816c3d15bce05da611bd6bae53
Gilles Debunne [Mon, 4 Oct 2010 23:45:32 +0000 (16:45 -0700)]
am
a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Merge commit '
a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp
* commit '
a29643a6455df7d3d615cdc45e11c437fe4b6cee':
DO NOT MERGE. Select word no longer selects spaces between words.
Gilles Debunne [Mon, 4 Oct 2010 23:42:40 +0000 (16:42 -0700)]
Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Scott Main [Mon, 4 Oct 2010 23:35:18 +0000 (16:35 -0700)]
am
c692792e: am
46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '
c692792ead7dab0a41181f4589c1d8d249d0ad88' into gingerbread-plus-aosp
* commit '
c692792ead7dab0a41181f4589c1d8d249d0ad88':
docs: update homepage with more countries for market announcement
Scott Main [Mon, 4 Oct 2010 23:31:47 +0000 (16:31 -0700)]
am
46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '
46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread
* commit '
46ffeb218859a543540a70b3229a48d2d96cbb4a':
docs: update homepage with more countries for market announcement
Gilles Debunne [Mon, 4 Oct 2010 23:03:52 +0000 (16:03 -0700)]
DO NOT MERGE. Select word no longer selects spaces between words.
Bug
3000870
This feature was useful to paste between two words. To do this, all you
have to do now in to first position the cursor between the words, and then
long pressing anywhere to get the pop-up menu with paste.
Not merged into HC since the paste story in HC still has to be determined.
Change-Id: Iea8d87e09b7ad43658ec5526110e609b9735c27a
Gilles Debunne [Mon, 4 Oct 2010 23:01:22 +0000 (16:01 -0700)]
Merge "resolved conflicts for merge of
242fa52b to master"
Patrick Dubroy [Mon, 4 Oct 2010 22:47:03 +0000 (15:47 -0700)]
resolved conflicts for merge of
242fa52b to master
Change-Id: I6a6c134fe4fb05dbc15249661b441d88534acb1e
Gil Dobjanschi [Mon, 4 Oct 2010 22:49:26 +0000 (15:49 -0700)]
Merge "Added audio track playback API"
Scott Main [Mon, 4 Oct 2010 22:49:07 +0000 (15:49 -0700)]
am
b3a5b85a: am
6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '
b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp
* commit '
b3a5b85a612703e54e631ffab5bb518eba909899':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
James Dong [Mon, 4 Oct 2010 22:48:59 +0000 (15:48 -0700)]
am
b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit '
b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp
* commit '
b99f0c7eae365f788a21944fef28de580c7f5f92':
Resilent media time stamp adjustment
Gilles Debunne [Mon, 4 Oct 2010 22:48:54 +0000 (15:48 -0700)]
am
b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
Merge commit '
b621e2030d86356af6e8f37e9aed339a5f2ea52b' into gingerbread-plus-aosp
* commit '
b621e2030d86356af6e8f37e9aed339a5f2ea52b':
Removed icon in Alert dialog header.
Adam Powell [Mon, 4 Oct 2010 22:48:50 +0000 (15:48 -0700)]
am
368733b2: Remove overscroll_edge.png from drawable/
Merge commit '
368733b204805cfa716897b09153350a70dca3f3' into gingerbread-plus-aosp
* commit '
368733b204805cfa716897b09153350a70dca3f3':
Remove overscroll_edge.png from drawable/
Adam Powell [Mon, 4 Oct 2010 22:48:37 +0000 (15:48 -0700)]
am
103f59ba: Merge "Fix bug
3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit '
103f59baa7f7d03cfe22a4b07690cc809185dfe9' into gingerbread-plus-aosp
* commit '
103f59baa7f7d03cfe22a4b07690cc809185dfe9':
Fix bug
3052686 - ScrollView padding treated incorrectly
Scott Main [Fri, 1 Oct 2010 22:02:42 +0000 (15:02 -0700)]
docs: update homepage with more countries for market announcement
Change-Id: Icb56ddd57ca23b2773792f171bc65327b2f725bd
Scott Main [Mon, 4 Oct 2010 22:39:24 +0000 (15:39 -0700)]
am
6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '
6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread
* commit '
6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
James Dong [Mon, 4 Oct 2010 22:35:40 +0000 (15:35 -0700)]
Merge "Resilent media time stamp adjustment" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 22:34:43 +0000 (15:34 -0700)]
Merge "Removed icon in Alert dialog header." into gingerbread
Adam Powell [Mon, 4 Oct 2010 22:28:25 +0000 (15:28 -0700)]
Remove overscroll_edge.png from drawable/
This crops up in apps targeting <= cupcake. This asset shouldn't be
there.
Change-Id: Ia8f613b1c2657111f8ff5e20d9571290add03ddb
Adam Powell [Mon, 4 Oct 2010 22:24:29 +0000 (15:24 -0700)]
Merge "Fix bug
3052686 - ScrollView padding treated incorrectly" into gingerbread
Kenny Root [Mon, 4 Oct 2010 21:20:14 +0000 (14:20 -0700)]
Use pread() in ZipFileRO for Linux
AssetManager instances are created by zygote and passed to all its
children so that they don't have to individually open
frameworks-res.apk. This creates a problem for determining the current
file offset when using lseek() on those files, because you can't
guarantee the cross-process locking of a mutex. Luckily, Linux
implements pread() to get around this suckiness.
The problem is that only Linux implements this, so we have to keep the
old locking for use on host builds with aapt and friends. aapt doesn't
have this same problem of sharing file descriptors across forked
processes, so we can keep the local AutoMutex to protect accesses of
those files.
Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
Chet Haase [Thu, 16 Sep 2010 18:15:56 +0000 (11:15 -0700)]
Add ability to automate animated transitions on View show/hide
Change-Id: Id6ff92c8fd06c3f5fb30c41b020b4de4f567154f