OSDN Git Service
Svetoslav Ganov [Tue, 4 Jan 2011 18:59:48 +0000 (10:59 -0800)]
Merge "Fixing bugs
3315632 3235958, performing a clean up of the WebView accessibility feature. Updated event hadndling to deliver all key events to javaScript if a screen reader is injected since the latter is responsible for the full set of navigation and exploration actions."
Andreas Huber [Tue, 4 Jan 2011 18:37:30 +0000 (10:37 -0800)]
Merge "Make AwesomePlayer's reset process more verbose to track down ANRs."
Xavier Ducrohet [Tue, 4 Jan 2011 10:41:50 +0000 (02:41 -0800)]
Merge "LayoutLib: Misc javadoc fixes."
Nick Pelly [Tue, 4 Jan 2011 06:41:40 +0000 (22:41 -0800)]
am
c5caaf5f: am
8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
* commit '
c5caaf5ff816a664939f305ead1091eb2c02cbf5':
Added response flags and DSFID extras for NfcV technology (API part).
Nick Pelly [Tue, 4 Jan 2011 06:39:42 +0000 (22:39 -0800)]
am
8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
* commit '
8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35':
Added response flags and DSFID extras for NfcV technology (API part).
Nick Pelly [Tue, 4 Jan 2011 06:38:14 +0000 (22:38 -0800)]
Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 06:37:37 +0000 (22:37 -0800)]
am
d81c68c3: am
a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
* commit '
d81c68c31e916fa201f4cd608261afa4d1f0adb6':
Tweak Ndef.getType() API. Rename constants, expand javadoc.
Nick Pelly [Tue, 4 Jan 2011 06:35:49 +0000 (22:35 -0800)]
am
a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
* commit '
a743448a1b34d950b1e6f06e308ce113cbc9abcb':
Tweak Ndef.getType() API. Rename constants, expand javadoc.
Nick Pelly [Tue, 4 Jan 2011 06:32:56 +0000 (22:32 -0800)]
Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 05:03:06 +0000 (21:03 -0800)]
am
a3e4293c: am
163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
* commit '
a3e4293cdc7d09ac93c95d233e4052ac4435773e':
Added getType() to NDEF technology class (API part).
Nick Pelly [Tue, 4 Jan 2011 05:01:01 +0000 (21:01 -0800)]
am
163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
* commit '
163bd407492bbadcdc8f0759191e1b9142d06859':
Added getType() to NDEF technology class (API part).
Nick Pelly [Tue, 4 Jan 2011 04:58:26 +0000 (20:58 -0800)]
Merge "Added getType() to NDEF technology class (API part)." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 04:13:17 +0000 (20:13 -0800)]
am
30ce5f85: am
8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
* commit '
30ce5f8567df2132736486bb93a60f49582508ec':
Removed selectAid() from IsoDep.
Nick Pelly [Tue, 4 Jan 2011 04:11:08 +0000 (20:11 -0800)]
am
8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
* commit '
8c09ef91aef0706a012e449ba3d16c03e0d64508':
Removed selectAid() from IsoDep.
Nick Pelly [Tue, 4 Jan 2011 04:09:03 +0000 (20:09 -0800)]
Merge "Removed selectAid() from IsoDep." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 02:37:05 +0000 (18:37 -0800)]
am
7e4d74f7: am
4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
* commit '
7e4d74f7b9355e8abd6e2fa30e284c9116a08998':
Added transfer/restore convience cmds to MF Classic tech.
Nick Pelly [Tue, 4 Jan 2011 02:34:37 +0000 (18:34 -0800)]
am
4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
* commit '
4b94dee8336a1135e4fc67a5911223bb5aabad99':
Added transfer/restore convience cmds to MF Classic tech.
Nick Pelly [Tue, 4 Jan 2011 02:33:09 +0000 (18:33 -0800)]
Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
Adam Powell [Tue, 4 Jan 2011 00:56:23 +0000 (16:56 -0800)]
Merge "Fix bug
3300456 - Prevent duplicate action bar backgrounds in shared container"
Dianne Hackborn [Mon, 3 Jan 2011 23:05:29 +0000 (15:05 -0800)]
Merge "Again maybe fix issue #
3169193..."
Amith Yamasani [Mon, 3 Jan 2011 22:08:42 +0000 (14:08 -0800)]
Merge "Fix a layout alignment issue in RingtonePickerActivity."
Svetoslav Ganov [Mon, 3 Jan 2011 21:46:33 +0000 (13:46 -0800)]
Merge "Fixed the NumberPicker to adjust to the closest value while scrolling/flinging"
John Wang [Mon, 3 Jan 2011 16:49:05 +0000 (08:49 -0800)]
am
e8522998: am
06fccc32: Merge "Clear request list while timeout." into gingerbread
* commit '
e85229988e6350a684be91c3bbf64232271c5663':
Clear request list while timeout.
John Wang [Mon, 3 Jan 2011 16:46:47 +0000 (08:46 -0800)]
am
06fccc32: Merge "Clear request list while timeout." into gingerbread
* commit '
06fccc325123bf4c9ebd04ac9300b504436724fe':
Clear request list while timeout.
John Wang [Mon, 3 Jan 2011 16:44:17 +0000 (08:44 -0800)]
Merge "Clear request list while timeout." into gingerbread
Svetoslav Ganov [Thu, 30 Dec 2010 03:22:07 +0000 (19:22 -0800)]
Merge "
3304011 At times Talkback still works after disabling it."
Robert Ly [Thu, 30 Dec 2010 02:29:25 +0000 (18:29 -0800)]
Merge "Doc change: Updating toc with final restructuring changes"
Robert Ly [Thu, 30 Dec 2010 01:32:52 +0000 (17:32 -0800)]
Merge "Doc change: Updating title"
Robert Ly [Thu, 30 Dec 2010 01:32:27 +0000 (17:32 -0800)]
Merge "Doc change: Updating title to "connecting hardware devices""
Robert Ly [Thu, 30 Dec 2010 01:32:16 +0000 (17:32 -0800)]
Merge "Doc change: updating title"
Robert Ly [Thu, 30 Dec 2010 01:32:06 +0000 (17:32 -0800)]
Merge "Doc change: Updating titles"
Lorenzo Colitti [Thu, 30 Dec 2010 01:23:33 +0000 (17:23 -0800)]
Merge "Get rid of setupDataCallWithProtocol."
Dianne Hackborn [Thu, 30 Dec 2010 00:50:24 +0000 (16:50 -0800)]
Merge "Don't let services in persistent processes be lost after crashing."
Robert Greenwalt [Thu, 30 Dec 2010 00:29:37 +0000 (16:29 -0800)]
Merge "Cache the current value of background-data."
Jason Sams [Thu, 30 Dec 2010 00:27:00 +0000 (16:27 -0800)]
Merge "Move adapter2D to a derived class from Allocation."
Robert Ly [Wed, 29 Dec 2010 23:00:18 +0000 (15:00 -0800)]
Merge "Doc change: toc changes for restructuring of dev guide"
Robert Ly [Wed, 29 Dec 2010 22:59:48 +0000 (14:59 -0800)]
Merge "Doc change: Debugging section of dev guide restructuring"
Robert Ly [Wed, 29 Dec 2010 22:59:42 +0000 (14:59 -0800)]
Merge "Doc change: Tools section of the dev guide restructuring"
Robert Ly [Wed, 29 Dec 2010 22:59:35 +0000 (14:59 -0800)]
Merge "Doc change: restructuring changes for building and running section of dev guide"
Robert Ly [Wed, 29 Dec 2010 22:59:30 +0000 (14:59 -0800)]
Merge "Doc change: adding Projects section of dev guide"
Robert Ly [Wed, 29 Dec 2010 22:59:19 +0000 (14:59 -0800)]
Merge "Doc change: restructuring of developing topics. Includes Overview, Creating and Managing AVDs, and Connecting HW Devices"
Amith Yamasani [Wed, 29 Dec 2010 22:28:39 +0000 (14:28 -0800)]
Merge "Use proper divider asset and margins."
Jeff Brown [Wed, 29 Dec 2010 21:22:08 +0000 (13:22 -0800)]
Merge "Add initial support for cursor-based pointing devices."
Jeff Brown [Fri, 24 Dec 2010 01:50:18 +0000 (17:50 -0800)]
Add initial support for cursor-based pointing devices.
Some parts stubbed out but you can plug in a mouse and move
a green cursor around to interact with the UI.
Change-Id: I80d597a7f11d3bd92041890f74b3c77326975e6e
Cary Clark [Wed, 29 Dec 2010 20:01:09 +0000 (12:01 -0800)]
Merge "defer accelerator keys to hosting application"
Alex Sakhartchouk [Wed, 29 Dec 2010 17:22:19 +0000 (09:22 -0800)]
Merge "Fixing a bug in the load function."
Mike Lockwood [Wed, 29 Dec 2010 14:13:24 +0000 (06:13 -0800)]
Merge "Change libusbhost and libmtp from static to shared libraries"
Jean-Baptiste Queru [Tue, 28 Dec 2010 23:53:41 +0000 (15:53 -0800)]
am
a6ac0ec3: am
69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit '
a6ac0ec30dfdacb7baba126b5cea69fc7097496e':
according to rfc2617, nc-value = 8LHEX
Jean-Baptiste Queru [Tue, 28 Dec 2010 23:47:42 +0000 (15:47 -0800)]
am
69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit '
69ebb984f230a523dc316bdb2c9e9c28111364fd':
according to rfc2617, nc-value = 8LHEX
Jean-Baptiste Queru [Tue, 28 Dec 2010 23:33:10 +0000 (15:33 -0800)]
Merge "according to rfc2617, nc-value = 8LHEX"
Alon Albert [Tue, 28 Dec 2010 23:09:09 +0000 (15:09 -0800)]
am
2967aa3e: (-s ours) am
672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
* commit '
2967aa3e6060f582f166cdb334a0fb9ff0cb4759':
Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
Svetoslav Ganov [Tue, 28 Dec 2010 23:06:34 +0000 (15:06 -0800)]
Merge "
3313982 DatePicker/TimePicker allow users to scroll date/time even when disabled."
Alon Albert [Tue, 28 Dec 2010 22:57:09 +0000 (14:57 -0800)]
am
672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
* commit '
672ebb61a755e4bbe60e4e884b1adadf186733b6':
Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
Alon Albert [Tue, 28 Dec 2010 22:44:51 +0000 (14:44 -0800)]
Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
Svetoslav Ganov [Tue, 28 Dec 2010 20:44:54 +0000 (12:44 -0800)]
Merge "Adding APIs for setting whether to show week number and setting the start day of week. Cleaned up the code a bit."
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:54:08 +0000 (11:54 -0800)]
am
6637e307: am
bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"
* commit '
6637e307494475b85afe8869d312d4a2f832d8f4':
Fix for writing empty strings to Parcel::writeString8()
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:39:21 +0000 (11:39 -0800)]
am
bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"
* commit '
bfb5f5966b36c4960b56f6de10ba261332208db9':
Fix for writing empty strings to Parcel::writeString8()
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:25:50 +0000 (11:25 -0800)]
Merge "Fix for writing empty strings to Parcel::writeString8()"
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:00:39 +0000 (11:00 -0800)]
am
e90a1b16: am
752942ec: Merge "The phone is crashing when unknown mime content is transferred."
* commit '
e90a1b16a3d6c559cb7fc47ad967a1810d88e923':
The phone is crashing when unknown mime content is transferred.
Dianne Hackborn [Tue, 28 Dec 2010 18:57:51 +0000 (10:57 -0800)]
am
536feda7: am
949fc0ef: Merge "frameworks/base: Fix to release references to previous live wallpaper"
* commit '
536feda7b133b297d43ea62111979d150f222d88':
frameworks/base: Fix to release references to previous live wallpaper
Dianne Hackborn [Tue, 28 Dec 2010 18:57:43 +0000 (10:57 -0800)]
am
878fb913: am
6c5d151b: Merge "frameworks/base: Fix to release references in ActivityManagerService"
* commit '
878fb9138b4de5767131be6a2e270cbd834daad3':
frameworks/base: Fix to release references in ActivityManagerService
Jean-Baptiste Queru [Tue, 28 Dec 2010 18:55:04 +0000 (10:55 -0800)]
am
752942ec: Merge "The phone is crashing when unknown mime content is transferred."
* commit '
752942ec4719e6a274d6ab11103ac28459cb0f0c':
The phone is crashing when unknown mime content is transferred.
Dianne Hackborn [Tue, 28 Dec 2010 18:38:38 +0000 (10:38 -0800)]
am
949fc0ef: Merge "frameworks/base: Fix to release references to previous live wallpaper"
* commit '
949fc0efc3203c580372e7713df5331818ae81f1':
frameworks/base: Fix to release references to previous live wallpaper
Dianne Hackborn [Tue, 28 Dec 2010 18:38:32 +0000 (10:38 -0800)]
am
6c5d151b: Merge "frameworks/base: Fix to release references in ActivityManagerService"
* commit '
6c5d151b29d7ae311267fa44048fbadb759b7a5a':
frameworks/base: Fix to release references in ActivityManagerService
Jean-Baptiste Queru [Tue, 28 Dec 2010 18:34:02 +0000 (10:34 -0800)]
Merge "The phone is crashing when unknown mime content is transferred."
Daisuke Miyakawa [Tue, 28 Dec 2010 18:07:30 +0000 (10:07 -0800)]
Merge "Let callers replace layout for LocalePicker adapter."
Cary Clark [Tue, 28 Dec 2010 16:54:30 +0000 (08:54 -0800)]
Merge "map keyboard for webview"
Ken Wakasa [Sun, 26 Dec 2010 09:08:01 +0000 (01:08 -0800)]
Merge "Add TYPE_NUMBER_VARIATION_PASSWORD for entering a numeric password."
Irfan Sheriff [Fri, 24 Dec 2010 20:34:52 +0000 (12:34 -0800)]
Merge "Enable networks on screen on"
Kristian Monsen [Fri, 24 Dec 2010 12:17:05 +0000 (04:17 -0800)]
Merge "Only register one ProxyReceiver"
Jamie Gennis [Fri, 24 Dec 2010 00:58:22 +0000 (16:58 -0800)]
Merge "egl: fixes for object refcounts"
Vasu Nori [Fri, 24 Dec 2010 00:48:18 +0000 (16:48 -0800)]
Merge "fix all flaky tests to make them work consistently."
Guang Zhu [Fri, 24 Dec 2010 00:28:13 +0000 (16:28 -0800)]
Merge "bugfix: remove dump timeout message after dump is received"
Michael I. Gold [Thu, 23 Dec 2010 21:51:36 +0000 (13:51 -0800)]
egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I213b8be77b1a23b5a8a6afaac60643662c8aa010
Eric Fischer [Thu, 23 Dec 2010 22:46:23 +0000 (14:46 -0800)]
Merge "Import revised translations."
Guang Zhu [Thu, 23 Dec 2010 22:44:15 +0000 (14:44 -0800)]
Merge "Throw exception if webview dump times out"
Dianne Hackborn [Thu, 23 Dec 2010 22:29:36 +0000 (14:29 -0800)]
am
cc43401c: am
6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
* commit '
cc43401cd10c681238e0be01de8fe14f5da94fb1':
frameworks/base: Fix to release references in ActivityManagerService
Jeff Brown [Thu, 23 Dec 2010 22:27:29 +0000 (14:27 -0800)]
am
fa93584a: (-s ours) am
c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
* commit '
fa93584a4fab6ca8d9348658dc30cedf76891753':
Fix policy issues when screen is off. (DO NOT MERGE)
Dianne Hackborn [Thu, 23 Dec 2010 22:22:32 +0000 (14:22 -0800)]
am
6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
* commit '
6eef0ca59438a15d14be8a72b6b29f01da91a5b8':
frameworks/base: Fix to release references in ActivityManagerService
Dianne Hackborn [Thu, 23 Dec 2010 22:19:03 +0000 (14:19 -0800)]
Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
Dianne Hackborn [Thu, 23 Dec 2010 22:17:54 +0000 (14:17 -0800)]
Merge "frameworks/base: Fix to release references to previous live wallpaper"
Dianne Hackborn [Thu, 23 Dec 2010 22:14:38 +0000 (14:14 -0800)]
Merge "frameworks/base: Fix to release references in ActivityManagerService"
Andreas Huber [Thu, 23 Dec 2010 21:11:29 +0000 (13:11 -0800)]
Merge "Squashed commit of the following:"
Jaikumar Ganesh [Thu, 23 Dec 2010 21:06:50 +0000 (13:06 -0800)]
Merge "Expose insecure rfcomm Bluetooth API."
Jeff Brown [Thu, 23 Dec 2010 20:43:48 +0000 (12:43 -0800)]
am
c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
* commit '
c6f2b3b302c06b8b7b81ec7e3a43a7df1813d0e0':
Fix policy issues when screen is off. (DO NOT MERGE)
Jeff Brown [Thu, 23 Dec 2010 20:41:59 +0000 (12:41 -0800)]
Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
Shimeng (Simon) Wang [Thu, 23 Dec 2010 19:41:54 +0000 (11:41 -0800)]
Merge "Merge WebKit at r73109: update web_user_agent string."
Gilles Debunne [Thu, 23 Dec 2010 19:20:48 +0000 (11:20 -0800)]
Merge "Fix for ellipsized text that has two lines at maximum."
Irfan Sheriff [Thu, 23 Dec 2010 17:17:39 +0000 (09:17 -0800)]
Merge "Fix wifi broadcasts"
Kristian Monsen [Thu, 23 Dec 2010 15:35:40 +0000 (07:35 -0800)]
Merge "Only store Application context"
Shih-wei Liao [Thu, 23 Dec 2010 15:08:54 +0000 (07:08 -0800)]
Merge "Clean-up."
Xavier Ducrohet [Thu, 23 Dec 2010 08:13:24 +0000 (00:13 -0800)]
Merge "LayoutLib: improve bitmap support."
Xavier Ducrohet [Thu, 23 Dec 2010 08:09:07 +0000 (00:09 -0800)]
Merge "LayoutLib: support for layers."
Dianne Hackborn [Thu, 23 Dec 2010 02:40:56 +0000 (18:40 -0800)]
am
60238734: am
2dda21b9: Merge "Another stab at fixing issue #
3149290 java.lang.RuntimeException:..." into gingerbread
* commit '
6023873463331d30b7ed12942c3323f1b6975ed8':
Another stab at fixing issue #
3149290 java.lang.RuntimeException:...
Dianne Hackborn [Thu, 23 Dec 2010 02:37:08 +0000 (18:37 -0800)]
am
2dda21b9: Merge "Another stab at fixing issue #
3149290 java.lang.RuntimeException:..." into gingerbread
* commit '
2dda21b93f8a8e0fb70de44eae826bc68349813c':
Another stab at fixing issue #
3149290 java.lang.RuntimeException:...
Dianne Hackborn [Thu, 23 Dec 2010 02:34:40 +0000 (18:34 -0800)]
Merge "Another stab at fixing issue #
3149290 java.lang.RuntimeException:..." into gingerbread
Jeff Brown [Thu, 23 Dec 2010 02:29:19 +0000 (18:29 -0800)]
Merge "Enable touch splitting by default for Honeycomb apps."
Dianne Hackborn [Thu, 23 Dec 2010 01:44:14 +0000 (17:44 -0800)]
Merge "Fix issue #
3299143: Problem report for Hanping Chinese Dictionary Pro"
Jim Miller [Thu, 23 Dec 2010 01:35:26 +0000 (17:35 -0800)]
Merge "Fix
3298264: Update LockScreen DigitalClock with new font"
Jeff Brown [Sat, 30 Oct 2010 04:50:21 +0000 (21:50 -0700)]
Fix policy issues when screen is off. (DO NOT MERGE)
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
is not showing (the proximity sensor turned off the screen).
Previously we passed all non-wake keys through in this case which
caused a bug on Crespo where the screen would come back on if a soft key
was held at the time of power off because the resulting key up event
would sneak in just before the keyguard was shown. It would then be
passed through to the dispatcher which would poke user activity and
wake up the screen.
- We propagate the key flags when broadcasting media keys which
ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).
Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.
Changed the lock screen so that it does not poke the wake lock when the
grab handle is released. This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.
Bug:
3144874
Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697