OSDN Git Service
Nick Pelly [Tue, 11 Oct 2011 19:39:46 +0000 (12:39 -0700)]
Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's."
Jeff Brown [Tue, 11 Oct 2011 19:35:05 +0000 (12:35 -0700)]
Merge "Don't log BlockGuard violations on ENG builds."
Daniel Sandler [Tue, 11 Oct 2011 19:01:15 +0000 (12:01 -0700)]
Merge "Stop enabling all disabled status bar features from GlobalActions."
Svetoslav Ganov [Tue, 11 Oct 2011 18:30:45 +0000 (11:30 -0700)]
Merge changes I67d080ab,Ia3d7a5ad
* changes:
AdapterView does not set setCurrentItemIndex in accessibility event.
AdapterView#isScrollableForAccessibility does not handle null adapter.
Ying Wang [Tue, 11 Oct 2011 17:01:39 +0000 (10:01 -0700)]
Merge "Remove non-module names from PRODUCT_PACKAGES"
The Android Open Source Project [Tue, 11 Oct 2011 11:29:26 +0000 (04:29 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ibd1dca227b44e13538ea0b9f6aea45d180a010d3
Mathias Agopian [Tue, 11 Oct 2011 05:21:57 +0000 (22:21 -0700)]
Merge "fix an issue where the screen could stay off"
Mathias Agopian [Tue, 11 Oct 2011 05:18:55 +0000 (22:18 -0700)]
fix an issue where the screen could stay off
this would happen when toggling on/off/on very fast, the screen
could stay black (while the panel is on).
Bug:
5429724
Change-Id: Ic8aa6aff066e6267923c0d47ef65e314e7bb6d41
Jim Miller [Tue, 11 Oct 2011 05:06:07 +0000 (22:06 -0700)]
Merge "Fix
5386408: Fix battery state information propagation in Lock Screen"
The Android Automerger [Tue, 11 Oct 2011 03:38:59 +0000 (20:38 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Jim Miller [Tue, 11 Oct 2011 03:06:29 +0000 (20:06 -0700)]
Merge "Fix
5249234: Add contentDescription to buttons on transport control on lock screen."
Dianne Hackborn [Tue, 11 Oct 2011 02:16:52 +0000 (19:16 -0700)]
Merge "Keep screen brightness at 0 while waiting for the UI to be displayed."
Dianne Hackborn [Tue, 11 Oct 2011 02:15:32 +0000 (19:15 -0700)]
Merge "Fix issue #
5435470: SharedPreferencesImpl should read from file..."
Mathias Agopian [Tue, 11 Oct 2011 02:05:23 +0000 (19:05 -0700)]
Merge "Fix screen off animation when in landscape"
Mathias Agopian [Tue, 11 Oct 2011 02:02:07 +0000 (19:02 -0700)]
Fix screen off animation when in landscape
Change-Id: I4bc5b12d7a64a4bf8b9a851594be4d60b790d1ed
Jeff Sharkey [Tue, 11 Oct 2011 00:47:46 +0000 (17:47 -0700)]
Merge "Over-limit within handful of MTU's, update assets."
Svetoslav Ganov [Tue, 11 Oct 2011 00:39:54 +0000 (17:39 -0700)]
Merge "Adding accessibility support to the pattern lock."
Jake Hamby [Tue, 11 Oct 2011 00:34:15 +0000 (17:34 -0700)]
Merge "Add "format" extra to SMS delivery report intents."
Christopher Tate [Tue, 11 Oct 2011 00:27:05 +0000 (17:27 -0700)]
Merge "Gracefully handle "needs init" transport errors at finish"
Justin Ho [Mon, 10 Oct 2011 23:46:35 +0000 (16:46 -0700)]
Resolved conflicts for merge of
83cf0313 to master
Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344
Amith Yamasani [Mon, 10 Oct 2011 23:34:34 +0000 (16:34 -0700)]
Merge "Don't show icon for power-off confirmation dialog."
Hiroshi Lockheimer [Mon, 10 Oct 2011 23:34:23 +0000 (16:34 -0700)]
Merge "Ensuring previous sounds are named correctly Bug:
5416299" into ics-factoryrom
Jim Miller [Mon, 10 Oct 2011 23:30:06 +0000 (16:30 -0700)]
Merge "Fix
5406921: Register for receiving phone state changes when KGSVM gets created."
Steven Ross [Mon, 10 Oct 2011 23:28:36 +0000 (16:28 -0700)]
Merge "Fixes
5429869 Only displaying FaceUnlock when window is focused"
Dianne Hackborn [Mon, 10 Oct 2011 23:08:05 +0000 (16:08 -0700)]
Merge "Fix issue #
5405788: Device continuously opening and closing..."
Svetoslav Ganov [Mon, 10 Oct 2011 23:05:53 +0000 (16:05 -0700)]
Merge "Accessibility text changed event text not populated."
The Android Open Source Project [Mon, 10 Oct 2011 22:39:41 +0000 (15:39 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I8642724549283dbcd3d104a35d5c659e5591682e
Romain Guy [Mon, 10 Oct 2011 22:24:06 +0000 (15:24 -0700)]
Merge "Don't call saveLayer() when it's not required Bug #
5435653"
James Dong [Mon, 10 Oct 2011 22:22:04 +0000 (15:22 -0700)]
Merge "Support AMR as a file type so that it can be imported into movie studio"
Gilles Debunne [Mon, 10 Oct 2011 22:18:35 +0000 (15:18 -0700)]
Merge "Bug
5437846: Crash in SpellChecker"
Justin Ho [Mon, 10 Oct 2011 21:43:35 +0000 (14:43 -0700)]
am
832c5485: Merge "Update screen lock/unlock sound Bug:
5416299" into ics-factoryrom
* commit '
832c54857519c405d7aa0d3bccfe74078f1a1abf':
Update screen lock/unlock sound Bug:
5416299
Justin Ho [Mon, 10 Oct 2011 21:43:33 +0000 (14:43 -0700)]
am
17249d64: Adding Pollux notification tone Bug:
5416299
* commit '
17249d6472b85e669c1b854fc413888e78af6def':
Adding Pollux notification tone Bug:
5416299
Amith Yamasani [Mon, 10 Oct 2011 21:37:25 +0000 (14:37 -0700)]
am
9e7caa0b: Tie the lockscreen sounds with the ringer volume.
* commit '
9e7caa0b270f8cea1fd2a61c5bffcf0df1037970':
Tie the lockscreen sounds with the ringer volume.
Marco Nelissen [Mon, 10 Oct 2011 21:37:23 +0000 (14:37 -0700)]
am
803ce0f9: (-s ours) Use SoundPool instead of Ringtone.
* commit '
803ce0f9fdd455dc4ec0c6ad9c141c76315fd4da':
Use SoundPool instead of Ringtone.
Romain Guy [Mon, 10 Oct 2011 21:07:10 +0000 (14:07 -0700)]
Merge "Make sure we have the correct GL context when grabbing a bitmap Bug #
5427391"
Jeff Brown [Mon, 10 Oct 2011 21:06:09 +0000 (14:06 -0700)]
Merge "Fix ownership of CursorWindows across processes. Bug:
5332296"
Derek Sollenberger [Mon, 10 Oct 2011 20:28:01 +0000 (13:28 -0700)]
Merge "Delay sending Plugin Draw event until the surface is ready."
John Reck [Mon, 10 Oct 2011 20:06:54 +0000 (13:06 -0700)]
Merge "Improve loadData JavaDoc"
Andreas Huber [Mon, 10 Oct 2011 19:45:02 +0000 (12:45 -0700)]
Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater"
Mathias Agopian [Mon, 10 Oct 2011 19:38:16 +0000 (12:38 -0700)]
Merge "enable EGL_IMG_context_priority for the omap4 platform"
Jeff Brown [Mon, 10 Oct 2011 18:48:58 +0000 (11:48 -0700)]
Merge "Fix Cursor leak in SettingsBackupAgent. Bug:
5434060"
Jeff Brown [Mon, 10 Oct 2011 18:48:53 +0000 (11:48 -0700)]
Merge "Always log StrictMode violations on ENG builds."
Jeff Brown [Mon, 10 Oct 2011 18:48:49 +0000 (11:48 -0700)]
Merge "Implement CloseGuard in ContentResolver."
Jeff Brown [Mon, 10 Oct 2011 18:48:39 +0000 (11:48 -0700)]
Merge "Clean up handrolled Binder proxies. Bug:
5332296"
Adam Powell [Mon, 10 Oct 2011 18:19:35 +0000 (11:19 -0700)]
Merge "Bug
5430909 - Overlay action bar should consume hover events"
Gilles Debunne [Mon, 10 Oct 2011 17:54:51 +0000 (10:54 -0700)]
Merge "Bug
5250788: LatinIME slows down as amount of Text increases"
Eric Fischer [Mon, 10 Oct 2011 17:29:17 +0000 (10:29 -0700)]
Merge "Import revised translations."
Justin Ho [Mon, 10 Oct 2011 17:08:55 +0000 (10:08 -0700)]
Merge "Update screen lock/unlock sound Bug:
5416299" into ics-factoryrom
Ben Murdoch [Mon, 10 Oct 2011 16:51:31 +0000 (09:51 -0700)]
Merge "Size Autocomplete drop down items correctly."
satok [Mon, 10 Oct 2011 08:08:27 +0000 (01:08 -0700)]
Merge "Add a hidden flag for the auto correction indicator in SuggestionSpan"
satok [Mon, 10 Oct 2011 07:59:41 +0000 (00:59 -0700)]
Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME"
Dianne Hackborn [Mon, 10 Oct 2011 00:14:49 +0000 (17:14 -0700)]
Merge "Calling close() outside of the main thread breaks stuff."
Jeff Sharkey [Mon, 10 Oct 2011 00:08:23 +0000 (17:08 -0700)]
Merge "Move battery stats to xt_qtaguid for data stats."
Dianne Hackborn [Sun, 9 Oct 2011 21:24:49 +0000 (14:24 -0700)]
Merge "Save the click position and restore it on orientation change."
The Android Automerger [Sun, 9 Oct 2011 20:30:09 +0000 (13:30 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
James Dong [Sun, 9 Oct 2011 16:16:37 +0000 (09:16 -0700)]
Merge "SurfaceFlinger: screenshots w/ protected buffers"
Roman Nurik [Sat, 8 Oct 2011 23:23:16 +0000 (16:23 -0700)]
Merge "Update Icon Guidelines and Icon Templates Pack for ICS"
Costin Manolache [Sat, 8 Oct 2011 00:54:05 +0000 (17:54 -0700)]
Merge "b/
5399355 StringIndexOutOfBoundsException from AccountManagerService"
Jamie Gennis [Fri, 7 Oct 2011 21:51:16 +0000 (14:51 -0700)]
SurfaceFlinger: screenshots w/ protected buffers
This change modifies SurfaceFlinger's screenshot behavior when a layer
with a protected buffer is visible. The previous behavior was to simply
fail the screenshot. The new behavior is to render the screenshot using
a placeholder texture where the protected buffer would have been.
Change-Id: I5e50cb2f3b31b2ea81cfe291c9b4a42e9ee71874
Mathias Agopian [Fri, 7 Oct 2011 22:42:53 +0000 (15:42 -0700)]
enable EGL_IMG_context_priority for the omap4 platform
Bug:
5311015
Change-Id: Icaad3d1c963d382ac0a4b9121fe20d3408846c2b
Mathias Agopian [Fri, 7 Oct 2011 22:38:50 +0000 (15:38 -0700)]
Merge "don't log EGL errors due to unimplemented proprietary extensions"
Dianne Hackborn [Fri, 7 Oct 2011 22:12:17 +0000 (15:12 -0700)]
Merge "Fix how we hide and show the nav bar."
Jeff Brown [Fri, 7 Oct 2011 22:08:24 +0000 (15:08 -0700)]
Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78
* changes:
Fix regression in CursorWindow.getString() Bug:
5332296
Clean up CursorWindow lifetime. Bug:
5332296
Fix regression in CursorWindow.copyStingToBuffer. Bug:
5332296
Jeff Brown [Fri, 7 Oct 2011 22:07:56 +0000 (15:07 -0700)]
Merge "Restore broken CursorWindow.getType behavior. Bug:
5430009"
Michael Kolb [Fri, 7 Oct 2011 22:07:29 +0000 (15:07 -0700)]
Merge "Handle audio focus in HTML5 audio"
Romain Guy [Fri, 7 Oct 2011 22:04:15 +0000 (15:04 -0700)]
Merge "Stupid fixed point math. Bug #
5423215"
Steven Ross [Fri, 7 Oct 2011 21:36:25 +0000 (14:36 -0700)]
Merge "Fixing alarm clock bug"
Christopher Tate [Fri, 7 Oct 2011 20:36:09 +0000 (13:36 -0700)]
Merge "Fix wallpaper restore"
Jeff Brown [Fri, 7 Oct 2011 20:28:18 +0000 (13:28 -0700)]
Fix regression in CursorWindow.copyStingToBuffer.
Bug:
5332296
Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
John Reck [Fri, 7 Oct 2011 20:10:55 +0000 (13:10 -0700)]
Merge "Fix calc visible to account for action bar"
Matthew Xie [Fri, 7 Oct 2011 19:57:08 +0000 (12:57 -0700)]
Merge "Turn off debug messge"
Fabrice Di Meglio [Fri, 7 Oct 2011 19:30:58 +0000 (12:30 -0700)]
Merge "Fix bug #
5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong"
Jason Sams [Fri, 7 Oct 2011 18:58:15 +0000 (11:58 -0700)]
Merge "Simplify the way we get the version info. Reduces startup overhead."
Adam Powell [Fri, 7 Oct 2011 18:16:51 +0000 (11:16 -0700)]
Merge "Fix bug
5399568 - ListView check states inconsistent after data set change"
Andreas Huber [Fri, 7 Oct 2011 17:08:48 +0000 (10:08 -0700)]
Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"
Iliyan Malchev [Fri, 7 Oct 2011 16:57:26 +0000 (09:57 -0700)]
Merge "Add initialize method to CameraHardwareInterface"
Steve Block [Fri, 7 Oct 2011 16:53:43 +0000 (09:53 -0700)]
Merge "Add WebViewClient.onProceededAfterSslError()"
Andreas Huber [Fri, 7 Oct 2011 14:59:35 +0000 (07:59 -0700)]
Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
The Android Open Source Project [Fri, 7 Oct 2011 12:35:36 +0000 (05:35 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I432900d452f3f8869f42a0ff4ae0d34e1c34dc46
Chih-Chung Chang [Fri, 7 Oct 2011 10:20:26 +0000 (03:20 -0700)]
Merge "Allow shutter/recording sound to be adjusted unless it's forced."
Wu-cheng Li [Fri, 7 Oct 2011 10:08:23 +0000 (03:08 -0700)]
Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
The Android Automerger [Fri, 7 Oct 2011 03:52:50 +0000 (20:52 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
James Dong [Fri, 7 Oct 2011 03:38:29 +0000 (20:38 -0700)]
Merge "Fix an issue where we should allow negative values but did not"
Christopher Tate [Fri, 7 Oct 2011 03:00:25 +0000 (20:00 -0700)]
am
a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restore
* commit '
a0c39e28e56d642168ad18dccb86f5787b4e1592':
DO NOT MERGE: fix wallpaper restore
Scott Main [Fri, 7 Oct 2011 01:41:48 +0000 (18:41 -0700)]
Merge "docs: deprecate thingy"
Nicolas Roard [Fri, 7 Oct 2011 01:29:20 +0000 (18:29 -0700)]
Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations."
Ying Wang [Fri, 7 Oct 2011 01:25:22 +0000 (18:25 -0700)]
Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf"
Anirudh Dewani [Fri, 7 Oct 2011 00:57:55 +0000 (17:57 -0700)]
Merge "Docs changes for WiFiDirect sample"
Svetoslav Ganov [Fri, 7 Oct 2011 00:28:51 +0000 (17:28 -0700)]
Merge "Accessibility test automation API not working."
Philip Milne [Fri, 7 Oct 2011 00:21:08 +0000 (17:21 -0700)]
Merge "Move Activity1 and Activity2 to API Demos area in development/samples."
Justin Ho [Thu, 6 Oct 2011 23:28:57 +0000 (16:28 -0700)]
Merge "Reference download asset through intermediate."
Jeff Brown [Thu, 6 Oct 2011 23:28:15 +0000 (16:28 -0700)]
Merge "Clean up CursorWindow code. Bug:
5332296"
Justin Ho [Thu, 6 Oct 2011 22:57:38 +0000 (15:57 -0700)]
am
65162b1e: Merge "Adding 3 additional notification sounds Bug:
5416299" into ics-factoryrom
* commit '
65162b1ee430cb8050109327a7fd958fa72d64ac':
Adding 3 additional notification sounds Bug:
5416299
Justin Ho [Thu, 6 Oct 2011 22:51:43 +0000 (15:51 -0700)]
Merge "Adding 3 additional notification sounds Bug:
5416299" into ics-factoryrom
Chia-chi Yeh [Thu, 6 Oct 2011 22:29:50 +0000 (15:29 -0700)]
Merge "VPN: temporarily disable the default proxy when VPN is active."
Chia-chi Yeh [Thu, 6 Oct 2011 22:29:43 +0000 (15:29 -0700)]
Merge "ConnectivityService: detach the logic of global proxy."
Dianne Hackborn [Thu, 6 Oct 2011 22:15:32 +0000 (15:15 -0700)]
Merge "Fix issue #
5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately"
Svetoslav Ganov [Thu, 6 Oct 2011 22:13:06 +0000 (15:13 -0700)]
Merge "Fixing errors in position information of scrollable views reported for accessibility."
Jeff Brown [Thu, 6 Oct 2011 20:11:04 +0000 (13:11 -0700)]
Clean up CursorWindow code.
Bug:
5332296
The code is functionally equivalent, but a little more efficient
and much easier to maintain.
Change-Id: I90670a13799df05831843a5137ab234929281b7c
Chet Haase [Thu, 6 Oct 2011 21:35:53 +0000 (14:35 -0700)]
Merge "Fix issue #
5367164: memory leak in LayoutTransition"