OSDN Git Service
Roman Nurik [Thu, 1 Mar 2012 17:26:24 +0000 (09:26 -0800)]
am
62b4e4a8: am
86ca108c: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
62b4e4a83ea949537ca4bb1f56074d63a17bf87a':
Roman Nurik [Thu, 1 Mar 2012 17:08:33 +0000 (09:08 -0800)]
am
b96ad49a: am
c47369d7: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
b96ad49a3a898b741f7c4d6854e599116546e2ac':
docs: Android Design downloads section, linkable H2s.
Robert Greenwalt [Thu, 1 Mar 2012 16:13:24 +0000 (08:13 -0800)]
Merge "Don't forget to turn off mobile_dun"
satok [Thu, 1 Mar 2012 08:25:03 +0000 (00:25 -0800)]
Merge "Handle sentence level spell checking hidden APIs"
Wu-cheng Li [Thu, 1 Mar 2012 06:49:10 +0000 (22:49 -0800)]
Merge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren."
Jeff Brown [Thu, 1 Mar 2012 05:29:22 +0000 (21:29 -0800)]
Merge "Externalize more SQLite configuration options."
Irfan Sheriff [Thu, 1 Mar 2012 03:33:06 +0000 (19:33 -0800)]
Merge "Improve Wi-Fi hand-off"
Romain Guy [Thu, 1 Mar 2012 03:16:15 +0000 (19:16 -0800)]
Merge "Full implementation of Canvas.drawPath()"
Fabrice Di Meglio [Thu, 1 Mar 2012 02:45:54 +0000 (18:45 -0800)]
Merge "Fix bug #
3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated"
Gilles Debunne [Thu, 1 Mar 2012 01:32:20 +0000 (17:32 -0800)]
Merge "Invalidate text display list on scroll"
Michael Jurka [Thu, 1 Mar 2012 01:30:05 +0000 (17:30 -0800)]
Merge "Fix alpha when swiping recents on tablets"
Jeff Brown [Thu, 1 Mar 2012 01:06:23 +0000 (17:06 -0800)]
Merge "Don't throw if sqlite3_finalize returns an error."
Jeff Brown [Thu, 1 Mar 2012 01:06:08 +0000 (17:06 -0800)]
Merge "Refactor SQLiteOpenHelper."
Andrew Hsieh [Thu, 1 Mar 2012 00:41:55 +0000 (16:41 -0800)]
Merge "Fixed several 64-bit porting issues"
James Dong [Thu, 1 Mar 2012 00:32:10 +0000 (16:32 -0800)]
Merge "Added permission check for all sensitive drm API calls"
Fabrice Di Meglio [Thu, 1 Mar 2012 00:20:24 +0000 (16:20 -0800)]
Merge "Fix bug #
5616520 When the device is set to Arabic, and the email application is launched, the guided text is not displayed"
Glenn Kasten [Wed, 29 Feb 2012 22:59:08 +0000 (14:59 -0800)]
Merge "Shorten thread names"
Glenn Kasten [Wed, 29 Feb 2012 22:56:30 +0000 (14:56 -0800)]
Merge "Prepare for threadLoop merge - active tracks"
Glenn Kasten [Wed, 29 Feb 2012 22:45:25 +0000 (14:45 -0800)]
Merge "AudioRecord const methods"
Glenn Kasten [Wed, 29 Feb 2012 22:44:39 +0000 (14:44 -0800)]
Merge "Update AudioFlinger comments"
Glenn Kasten [Wed, 29 Feb 2012 22:43:19 +0000 (14:43 -0800)]
Merge "Pull in declaration of effectChains to inner block"
Adam Powell [Wed, 29 Feb 2012 22:26:24 +0000 (14:26 -0800)]
Merge "Fix simple_list_item_multiple_choice to use correct size and spacing."
Christopher Tate [Wed, 29 Feb 2012 22:08:46 +0000 (14:08 -0800)]
Merge "Merge: Introduce UpdateLocks"
Svetoslav Ganov [Wed, 29 Feb 2012 22:08:13 +0000 (14:08 -0800)]
Merge "Update to allow passing empty string in a binding."
Jake Hamby [Wed, 29 Feb 2012 22:04:48 +0000 (14:04 -0800)]
Merge "Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready."
Eric Fischer [Wed, 29 Feb 2012 21:21:43 +0000 (13:21 -0800)]
Merge "Import translations. DO NOT MERGE"
Roman Nurik [Wed, 29 Feb 2012 20:49:31 +0000 (12:49 -0800)]
am
86ca108c: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
86ca108c65c3f8400e750d639b71d6a3cef5b600':
Roman Nurik [Wed, 29 Feb 2012 20:45:16 +0000 (12:45 -0800)]
am
c47369d7: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
c47369d7c5d3a588d7b0c655878f0bc7dd2ffedc':
docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:43:29 +0000 (12:43 -0800)]
am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:42:39 +0000 (12:42 -0800)]
am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
docs: Android Design downloads section, linkable H2s.
Jake Hamby [Wed, 29 Feb 2012 20:41:38 +0000 (12:41 -0800)]
Merge "Add support for CMAS warning notifications over CDMA."
Fabrice Di Meglio [Wed, 29 Feb 2012 20:38:44 +0000 (12:38 -0800)]
Merge "Fix bug #
5180841 TextLayoutCache needs to support Indic"
Fabrice Di Meglio [Wed, 29 Feb 2012 20:37:13 +0000 (12:37 -0800)]
Merge "Fix bug #
5217606 LocaleUtils constants TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE and TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE should be renamed"
Jeff Sharkey [Wed, 29 Feb 2012 20:29:22 +0000 (12:29 -0800)]
Merge "Wrap StrictMode changes in try/finally."
Fabrice Di Meglio [Wed, 29 Feb 2012 20:29:12 +0000 (12:29 -0800)]
Merge "Fix bug #
5371909 Hebrew & Arabic mails are sent as LTR intead of RTL"
Mathias Agopian [Wed, 29 Feb 2012 20:10:03 +0000 (12:10 -0800)]
Merge "get rid of MemoryHeapPmem"
Glenn Kasten [Wed, 29 Feb 2012 19:32:42 +0000 (11:32 -0800)]
Merge "Mark similar and different sections in threadLoop"
Gilles Debunne [Wed, 29 Feb 2012 18:59:56 +0000 (10:59 -0800)]
Merge "Vibrate on long press, even out of text"
Andreas Huber [Wed, 29 Feb 2012 17:20:24 +0000 (09:20 -0800)]
Merge "Separate the notion of "stop" from that of "release", i.e."
George Mount [Wed, 29 Feb 2012 15:17:12 +0000 (07:17 -0800)]
Merge "Add support for maxlength text fields to WebViewInputConnection."
Craig Mautner [Wed, 29 Feb 2012 14:18:23 +0000 (06:18 -0800)]
Merge changes I08fcd278,I1f496bb7
* changes:
Detect animation completions like we used to. Previous approximations weren't indicating completion and windows weren't being layered correctly as a result.
debug
Stephen Hines [Wed, 29 Feb 2012 05:01:36 +0000 (21:01 -0800)]
Merge "Add test for signed/unsigned char bug (conversion)."
James Dong [Wed, 29 Feb 2012 02:49:34 +0000 (18:49 -0800)]
Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."
Gilles Debunne [Wed, 29 Feb 2012 02:05:28 +0000 (18:05 -0800)]
Merge "InputConnection is warned when finished"
satok [Wed, 29 Feb 2012 01:56:43 +0000 (17:56 -0800)]
Merge "Unblock IPC call in TextServicesManagerService"
Bart Sears [Wed, 29 Feb 2012 01:30:29 +0000 (17:30 -0800)]
Merge "Update AndroidEmoji to version 1.01"
Glenn Kasten [Tue, 28 Feb 2012 20:30:08 +0000 (12:30 -0800)]
Shorten thread names
prctl(PR_SET_NAME) limits to 15 characters. Before we had names like
"Binder Thread #" and the counter was cut off :-( Also remove redundant
"thread" at end of name; it's always a thread.
Change-Id: I1f99c2730ba0787ed9b59c15914356cddf698e2f
Robert Ly [Tue, 28 Feb 2012 23:48:12 +0000 (15:48 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:45:40 +0000 (15:45 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:43:52 +0000 (15:43 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:42:32 +0000 (15:42 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:39:55 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:39:39 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:37:21 +0000 (15:37 -0800)]
Merge "fix bug
5911175" into ics-mr1
Gilles Debunne [Tue, 28 Feb 2012 23:32:04 +0000 (15:32 -0800)]
Merge "Removed TextAlign in TextView"
Dianne Hackborn [Tue, 28 Feb 2012 23:19:19 +0000 (15:19 -0800)]
am
11f343c6: am
c221d6ec: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
11f343c6b1b6a420c0a375edbb7c35d2fdb32482':
Dianne Hackborn [Tue, 28 Feb 2012 23:16:20 +0000 (15:16 -0800)]
am
c221d6ec: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
c221d6ec2fbaa73f82cd219e2d5ab078697070ab':
Jeff Sharkey [Tue, 28 Feb 2012 23:14:19 +0000 (15:14 -0800)]
Merge "Disable verbose NetworkStats logging."
Dianne Hackborn [Tue, 28 Feb 2012 23:10:39 +0000 (15:10 -0800)]
am
4953ec1c: am
a2e0e3b5: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
4953ec1c71c4c2c134da2c969945c0d8b4fcb03c':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:07:43 +0000 (15:07 -0800)]
am
a2e0e3b5: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:28 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:18 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:01:04 +0000 (15:01 -0800)]
Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
felipeal [Tue, 28 Feb 2012 22:59:29 +0000 (14:59 -0800)]
am
635d492d: (-s ours) am
4bcc9108: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
635d492d5918fe11a3a9bb9d9a87839a8331d34b':
felipeal [Tue, 28 Feb 2012 22:59:26 +0000 (14:59 -0800)]
am
96236bc8: (-s ours) am
fa73815e: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
96236bc8d93efc0573a18b87699d56a3ed8c0b0b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
Jean-Baptiste Queru [Tue, 28 Feb 2012 22:59:18 +0000 (14:59 -0800)]
am
ccd08b8d: am
e939edb5: am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
ccd08b8de9dc4c9cfaee93cbbcc7053cc9e8d96f':
Fixes update of extras Bundle in new Locations for GPS Provider
Michael Jurka [Tue, 28 Feb 2012 22:40:33 +0000 (14:40 -0800)]
Merge "Add shortcut for voice search"
James Dong [Tue, 28 Feb 2012 22:34:02 +0000 (14:34 -0800)]
Merge "Fix API issues in DrmRights class."
James Dong [Tue, 28 Feb 2012 22:33:19 +0000 (14:33 -0800)]
Merge "Deprecate default constructor for classes that should have been meant to be interfaces"
felipeal [Tue, 28 Feb 2012 22:09:43 +0000 (14:09 -0800)]
am
4bcc9108: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
4bcc910817c694c8d8b20e39a5ff42c584af1d49':
felipeal [Tue, 28 Feb 2012 22:07:26 +0000 (14:07 -0800)]
am
fa73815e: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
fa73815e1d953e67c635877440e717dc84465d97':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
felipeal [Tue, 28 Feb 2012 22:05:23 +0000 (14:05 -0800)]
am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
felipeal [Tue, 28 Feb 2012 22:04:20 +0000 (14:04 -0800)]
am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
Eric Fischer [Tue, 28 Feb 2012 21:56:29 +0000 (13:56 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 28 Feb 2012 21:55:24 +0000 (13:55 -0800)]
Merge "Import translations. DO NOT MERGE"
Jean-Baptiste Queru [Tue, 28 Feb 2012 21:53:17 +0000 (13:53 -0800)]
am
e939edb5: am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
e939edb5b4e991998ae8219b03d75c10cdc765cb':
Fixes update of extras Bundle in new Locations for GPS Provider
Jean-Baptiste Queru [Tue, 28 Feb 2012 21:33:44 +0000 (13:33 -0800)]
am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
f418738c64413b818e2dc507c912c2678876632f':
Fixes update of extras Bundle in new Locations for GPS Provider
Jean-Baptiste Queru [Tue, 28 Feb 2012 21:30:39 +0000 (13:30 -0800)]
am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
d7fa7deef9bc0cf22bf450fdb062327697c087c4':
Fixes update of extras Bundle in new Locations for GPS Provider
Jeff Sharkey [Tue, 28 Feb 2012 21:21:04 +0000 (13:21 -0800)]
Merge "Suppress StrictMode in handleBindApplication()."
James Dong [Tue, 28 Feb 2012 21:09:44 +0000 (13:09 -0800)]
Merge "Remove unnecessary header file includes for drmserver"
James Dong [Tue, 28 Feb 2012 21:09:24 +0000 (13:09 -0800)]
Merge "Added missing javadoc comment for public API in DrmUtils class"
Jason Noguchi [Tue, 28 Feb 2012 19:57:39 +0000 (11:57 -0800)]
am
bb189574: am
eac4b187: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
bb189574614d1ce8f9d61e58b7aebbd18f0d6c25':
Jason Noguchi [Tue, 28 Feb 2012 19:55:13 +0000 (11:55 -0800)]
am
a1de5e48: am
743aceec: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:53:49 +0000 (11:53 -0800)]
am
eac4b187: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
eac4b187d357eac61475c4dc6f673656e08e75a9':
Jason Noguchi [Tue, 28 Feb 2012 19:52:56 +0000 (11:52 -0800)]
am
743aceec: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
743aceec4289508a8c514dae7319659cf7f278c4':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:50:14 +0000 (11:50 -0800)]
am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:49:30 +0000 (11:49 -0800)]
am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:47:46 +0000 (11:47 -0800)]
Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
John Reck [Tue, 28 Feb 2012 19:40:00 +0000 (11:40 -0800)]
Merge "Fix cursorRingBounds NPE"
John Reck [Tue, 28 Feb 2012 19:38:56 +0000 (11:38 -0800)]
Merge "Fix NPE"
Dianne Hackborn [Tue, 28 Feb 2012 19:26:02 +0000 (11:26 -0800)]
Merge "You could think of this as what an OEM might do."
James Dong [Tue, 28 Feb 2012 19:23:26 +0000 (11:23 -0800)]
Merge "Deprecated a mis-spelled method and replaced it with a new method"
Android Git Automerger [Tue, 28 Feb 2012 18:51:35 +0000 (10:51 -0800)]
am
a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
Svetoslav Ganov [Tue, 28 Feb 2012 18:51:32 +0000 (10:51 -0800)]
am
8f4582a2: am
c78f1217: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
8f4582a278d3f93450f2a72ad6f6dc872668efb9':
Android Git Automerger [Tue, 28 Feb 2012 18:49:07 +0000 (10:49 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Svetoslav Ganov [Tue, 28 Feb 2012 18:41:42 +0000 (10:41 -0800)]
am
0c96daa5: am
0c7ffac4: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
0c96daa5d5a1ef778ad1ef4619ef1fa4c30519c6':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:39:17 +0000 (10:39 -0800)]
am
c78f1217: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
c78f121716ff7d4cbf8a70519a266ae030942751':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:38:39 +0000 (10:38 -0800)]
am
0c7ffac4: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:35:43 +0000 (10:35 -0800)]
am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:35:18 +0000 (10:35 -0800)]
am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.