OSDN Git Service
Adrian Ludwig [Fri, 30 Sep 2011 22:46:41 +0000 (15:46 -0700)]
Merge "Update existing security FAQ and Developer Overview"
Jamie Gennis [Fri, 30 Sep 2011 22:28:46 +0000 (15:28 -0700)]
Merge "SurfaceTexture: parameterize the texture target"
Jamie Gennis [Wed, 28 Sep 2011 19:13:31 +0000 (12:13 -0700)]
SurfaceTexture: parameterize the texture target
This change adds a hack to allow Android Browser to use a SurfaceTexture
to stream RGBA images to a GL_TEXTURE_2D texture object.
Change-Id: Idb90064d5d4b920959ef3be7451362ac5012460e
The Android Open Source Project [Fri, 30 Sep 2011 20:24:24 +0000 (13:24 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I0b476b0f30ab6e5747e67ab667fef7231b171787
The Android Automerger [Fri, 30 Sep 2011 20:12:46 +0000 (13:12 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Steven Ross [Fri, 30 Sep 2011 20:08:29 +0000 (13:08 -0700)]
Merge "Moving fallback check code to Settings"
Ying Wang [Fri, 30 Sep 2011 20:02:55 +0000 (13:02 -0700)]
Merge "Correction the use of SMALLER_FONT_FOOTPRINT"
Steven Ross [Fri, 30 Sep 2011 19:48:40 +0000 (15:48 -0400)]
Moving fallback check code to Settings
Change-Id: Ife924771d7bfedc6eccc6817172a699569560025
Marco Nelissen [Fri, 30 Sep 2011 18:13:39 +0000 (11:13 -0700)]
Merge "Remove Ringtone.setWakeMode, it's not needed."
Andreas Huber [Fri, 30 Sep 2011 18:13:21 +0000 (11:13 -0700)]
Merge "Gracefuly return on detecting wrong AAC format from corrupted files"
Steven Ross [Fri, 30 Sep 2011 18:08:47 +0000 (11:08 -0700)]
Merge "calling back SetupFaceLock to clean up temporary gallery"
Gilles Debunne [Fri, 30 Sep 2011 17:58:30 +0000 (10:58 -0700)]
Merge "Bug
5384675: Color in add to dictionary"
Gilles Debunne [Fri, 30 Sep 2011 17:58:10 +0000 (10:58 -0700)]
Merge "Bug
5384535: Underline for typo even if there are no suggestions"
Gilles Debunne [Fri, 30 Sep 2011 17:58:01 +0000 (10:58 -0700)]
Merge "Bug
5254884: suggestions are no logner copied in the clipboard"
Gilles Debunne [Fri, 30 Sep 2011 17:57:51 +0000 (10:57 -0700)]
Merge "Bug
5250788: EditText gets slower has the entered text gets longer"
Gilles-Arnaud Bleu-Laine [Fri, 16 Sep 2011 02:30:13 +0000 (21:30 -0500)]
Gracefuly return on detecting wrong AAC format from corrupted files
Return BAD_VALUE error upon detection of wrongly formatted files.
The client should abort the initialization upon error detection.
The current CHECK() interrupts the configurecodec() preventing a graceful
exit.
Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
repo sync [Fri, 30 Sep 2011 17:21:53 +0000 (10:21 -0700)]
am
8b42fcef: Fix wifi data activity icons
* commit '
8b42fcef5ac33d94b76e3002861d4ea4081a6a4f':
Fix wifi data activity icons
Gloria Wang [Fri, 30 Sep 2011 17:17:37 +0000 (10:17 -0700)]
Merge "Wait for some time before stopping the media recorder. Fix for bug
5239001."
repo sync [Fri, 30 Sep 2011 14:57:50 +0000 (07:57 -0700)]
Fix wifi data activity icons
Bug:
5393252
Change-Id: I6ca650b4f722b2c8cc4d17b1bc6ec2f2c0b7e10d
Gloria Wang [Fri, 30 Sep 2011 17:00:58 +0000 (10:00 -0700)]
Wait for some time before stopping the media recorder.
Fix for bug
5239001.
Change-Id: Ifa18a404e8568cced88a93b8d1a7125875aadb15
repo sync [Fri, 30 Sep 2011 16:57:51 +0000 (09:57 -0700)]
Merge "Fix wifi data activity icons"
repo sync [Fri, 30 Sep 2011 16:57:36 +0000 (09:57 -0700)]
Merge "Fix IPv6 on wifi"
Mark Wagner [Fri, 30 Sep 2011 16:55:10 +0000 (09:55 -0700)]
Merge "bugfix
5381702 MMS app puts temporary files on sdcard in wrong location"
Xavier Ducrohet [Fri, 30 Sep 2011 16:41:35 +0000 (09:41 -0700)]
Merge "LayoutLib: Fix native delegate for Display."
Wei Huang [Fri, 30 Sep 2011 16:23:03 +0000 (09:23 -0700)]
Merge "Convert content type "image/jpg" to "image/jpeg"."
Kenny Root [Fri, 30 Sep 2011 15:57:43 +0000 (08:57 -0700)]
Merge "Add DUMP permission checks to services"
repo sync [Fri, 30 Sep 2011 14:57:50 +0000 (07:57 -0700)]
Fix wifi data activity icons
Bug:
5393252
Change-Id: I6ca650b4f722b2c8cc4d17b1bc6ec2f2c0b7e10d
Daniel Sandler [Fri, 30 Sep 2011 14:48:51 +0000 (07:48 -0700)]
Merge "Add carrier info back to notification drawer."
Daniel Sandler [Fri, 30 Sep 2011 14:48:43 +0000 (07:48 -0700)]
Merge "Bring back nyandroid ADB icon."
The Android Open Source Project [Fri, 30 Sep 2011 14:09:59 +0000 (07:09 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ia9dffe4458e064a55878e989ba73763158e008fe
satok [Fri, 30 Sep 2011 10:31:35 +0000 (03:31 -0700)]
Merge "Fix a logic to recconect IME in InputMethodManagerService"
satok [Fri, 30 Sep 2011 08:21:46 +0000 (17:21 +0900)]
Fix a logic to recconect IME in InputMethodManagerService
Bug:
5380216
Change-Id: I7af67265eebbd28f002210d7ac90dd18f1858f66
satok [Fri, 30 Sep 2011 08:52:40 +0000 (01:52 -0700)]
Merge "Use user's settings for the spell check language instead of the system locale"
satok [Fri, 30 Sep 2011 06:14:21 +0000 (15:14 +0900)]
Use user's settings for the spell check language instead of the system locale
Bug:
5390462
Change-Id: Ia2a3981cb93f451646debe5ee6b037313825cf9f
Luca Zanolin [Fri, 30 Sep 2011 08:01:35 +0000 (01:01 -0700)]
Merge "The x and y position of the pop-up where not calculated correctly when the text view had internal scrolling."
Owen Lin [Fri, 30 Sep 2011 07:18:56 +0000 (15:18 +0800)]
Convert content type "image/jpg" to "image/jpeg".
"image/jpg" is not a valid mimetype while "image/jpeg" is.
So change it to "image/jpeg" to increase the compatibillity with other
Apps in android. (e.g., Gallery)
bug:
5342561
Change-Id: Ia37433e35482492b7226c87a670bef3399ac4bb6
Ying Wang [Fri, 30 Sep 2011 01:07:41 +0000 (18:07 -0700)]
Correction the use of SMALLER_FONT_FOOTPRINT
SMALLER_FONT_FOOTPRINT is a BoardConfig variable that's only available
in Android.mks but not product config makefiles.
Change-Id: I1784b6e8c744ffcca1538e76d338f5800f150e72
The Android Automerger [Fri, 30 Sep 2011 01:46:30 +0000 (18:46 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Mathias Agopian [Fri, 30 Sep 2011 01:37:44 +0000 (18:37 -0700)]
am
5d9a4f33: Merge "improve hwc log output" into ics-factoryrom
* commit '
5d9a4f33d3f1fcce55b686597d370d749b5c5c0d':
improve hwc log output
Mathias Agopian [Fri, 30 Sep 2011 01:34:22 +0000 (18:34 -0700)]
Merge "improve hwc log output" into ics-factoryrom
Xavier Ducrohet [Fri, 30 Sep 2011 01:33:50 +0000 (18:33 -0700)]
LayoutLib: Fix native delegate for Display.
Change-Id: If097cae2309d340162b3bac1d0f6a2289635adca
Mathias Agopian [Fri, 30 Sep 2011 01:07:08 +0000 (18:07 -0700)]
improve hwc log output
we now print the handle of each buffer
Change-Id: I4104cd6d3a0a303baf44c5c69de3bf36c237892e
Mathias Agopian [Fri, 30 Sep 2011 01:09:35 +0000 (18:09 -0700)]
Merge "improve hwc log output"
Mathias Agopian [Fri, 30 Sep 2011 01:07:08 +0000 (18:07 -0700)]
improve hwc log output
we now print the handle of each buffer
Change-Id: I70884ae458a9dcf10cfc403258d48eaa4618b7f4
Svetoslav Ganov [Fri, 30 Sep 2011 00:54:22 +0000 (17:54 -0700)]
Merge "ActivityChooserView shows "see all" improperly."
Fabrice Di Meglio [Fri, 30 Sep 2011 00:53:09 +0000 (17:53 -0700)]
Merge "Fix bug #
5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
Christopher Tate [Fri, 30 Sep 2011 00:28:29 +0000 (17:28 -0700)]
Merge "Enforce DUMP permission on BackupManagerService's dump() method"
Romain Guy [Fri, 30 Sep 2011 00:23:52 +0000 (17:23 -0700)]
Merge "TextureView works best when it draws stuff. Bug #
5391188"
Romain Guy [Fri, 30 Sep 2011 00:21:45 +0000 (17:21 -0700)]
TextureView works best when it draws stuff.
Bug #
5391188
Change-Id: I5e754881ccb08ff288ebd60de77282c9cbcf3f86
repo sync [Thu, 29 Sep 2011 19:40:02 +0000 (12:40 -0700)]
Fix IPv6 on wifi
Bug:
5388757
Change-Id: I3c8c776c26dad1daa9801d0455fde749c0206401
Svetoslav Ganov [Thu, 29 Sep 2011 23:50:59 +0000 (16:50 -0700)]
ActivityChooserView shows "see all" improperly.
1. The cooser was presenting the "Show all" option if the number
of available activities was more than the initial max count of activities
to be shown. Since the show all option is added to the drop down
the latter becomes effectively one longer than the initial max activity
count which may make the drop down taller than client expectats. Also
this leads to the case where if the activities are one more than the
initial activity count pressing the show all button will just replace
the show all item with the activity that did not fit - this is somehow
annoying to the user.
bug:
5379282
Change-Id: I2693214cb0b66edb2a3bdffc01ed29139341111c
Amith Yamasani [Thu, 29 Sep 2011 23:48:55 +0000 (16:48 -0700)]
Merge "Handle the case of Preference lists that have header views inserted at the top."
Romain Guy [Thu, 29 Sep 2011 23:39:16 +0000 (16:39 -0700)]
Merge "Add system property to force hw acceleration."
Romain Guy [Thu, 29 Sep 2011 23:37:27 +0000 (16:37 -0700)]
Add system property to force hw acceleration.
Change-Id: I538e641435f282b1af20866a8acd1f8d292734c4
Marco Nelissen [Thu, 29 Sep 2011 22:58:41 +0000 (15:58 -0700)]
Remove Ringtone.setWakeMode, it's not needed.
This partially reverts commit
e47e8520fa48bd014287eda94ea39927de73d6bc.
(the other part of that change was already removed as part of a different
change)
Change-Id: Ica7c196ab1f74f96237e64d07580832f0d50022f
Mangesh Ghiware [Thu, 29 Sep 2011 22:57:51 +0000 (15:57 -0700)]
Merge "Force a WebView pictureset reset on screen rotation."
The Android Automerger [Thu, 29 Sep 2011 22:21:22 +0000 (15:21 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Amith Yamasani [Thu, 29 Sep 2011 22:16:16 +0000 (15:16 -0700)]
Handle the case of Preference lists that have header views inserted at the top.
Without this change, wrong Preference is returned when you select one.
Subtract the number of headers from the index before querying the adapter.
Needed for:
Bug:
5203189
Change-Id: Iba7277789ebbd7e3e9954931b1ea06c7e34f3c15
Christopher Tate [Thu, 29 Sep 2011 22:13:11 +0000 (15:13 -0700)]
Enforce DUMP permission on BackupManagerService's dump() method
The text of the dumped output can potentially include an email address;
we don't want random code to be able to read it.
Bug
5389201
Change-Id: If84886357a36b7015878e4d72017abba83b4c511
Philip Milne [Thu, 29 Sep 2011 22:01:27 +0000 (15:01 -0700)]
Kenny Root [Thu, 29 Sep 2011 22:00:42 +0000 (15:00 -0700)]
Merge "Add package-verifier to aapt dump badging"
Philip Milne [Thu, 29 Sep 2011 21:14:25 +0000 (14:14 -0700)]
Fix for
5393156
. Fix for the above.
. Make instances of Space invisible by default.
. Correctly accomodate parental constraints when row/col order is undefined.
This fix allows GridLayout to accomodate simple dependencies between
its axes. In the example given in bug
5393156, the presence of a
multi-line TextView means that GridLayout can only compute its height
after it has computed its width. This fix adds a second measurement pass
to GridLayout that passes infomation betwen the axes, using the GridLayout's
orientation property to indicate which axis should be examined first.
Change-Id: I90761c6fcfe8edc7ef6d9a89076fd5cda3adc0a4
The Android Open Source Project [Thu, 29 Sep 2011 21:24:50 +0000 (14:24 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Iec5fbc58aa0d892e8fe3767aad9de7726ec0aa12
Roman Nurik [Thu, 29 Sep 2011 21:10:07 +0000 (14:10 -0700)]
Merge "Add 'updated' banner in guide TOC for media formats, rename Widgets design guide to App Widgets design guide"
Dima Zavin [Thu, 29 Sep 2011 21:06:38 +0000 (14:06 -0700)]
am
e8b7f4a2: eventhub: print debugginf info when removing device
* commit '
e8b7f4a20c43d8f55d0cf85a94363b764ba598b8':
eventhub: print debugginf info when removing device
Mark Wagner [Thu, 29 Sep 2011 20:58:59 +0000 (13:58 -0700)]
bugfix
5381702 MMS app puts temporary files on sdcard in wrong location
move this code into the app
Change-Id: Ieca6c603ee1163524ddb855800ade5e5a8fff0e5
Kenny Root [Thu, 29 Sep 2011 20:49:45 +0000 (13:49 -0700)]
Add package-verifier to aapt dump badging
Print out the package-verifier information when printing out badging.
Change-Id: I9c79c163261d5d4f1094bda76d90b3ff6e1ce540
Mangesh Ghiware [Thu, 29 Sep 2011 20:41:34 +0000 (13:41 -0700)]
Force a WebView pictureset reset on screen rotation.
This fixes some stale content issues when rotating the screen.
Bug:
5357237
Bug:
5361852
Change-Id: I574dac15dbb1a35a8830377848f38ba2b766f095
Marco Nelissen [Thu, 29 Sep 2011 20:13:17 +0000 (13:13 -0700)]
Merge "Use SoundPool instead of Ringtone."
Steven Ross [Wed, 28 Sep 2011 15:42:56 +0000 (11:42 -0400)]
calling back SetupFaceLock to clean up temporary gallery
This is done when the backup lock is complete or canceled.
If successful, the permanent gallery is replaced with the new one.
If canceled, the temporary gallery is deleted
Also deletes the main gallery if the lock type is changed from facial recognition
Change-Id: Id1ce804dec6b71b6410af53c050ad265c4cad5b0
Marco Nelissen [Thu, 29 Sep 2011 19:49:17 +0000 (12:49 -0700)]
Use SoundPool instead of Ringtone.
The lock screen was using Ringtone for the lock/unlock sounds, which
meant two new MediaPlayers were created every time a sound needed to
be played. In addition, the Ringtone was assigned to a local variable,
which means it could go be garbage collected and finalized while it
was still playing.
For short sounds that need to be played repeatedly, SoundPool is a
better option anyway, so use that instead.
b/
5382634
Change-Id: I8794cbb24604fa7c03032bd5e32ceab37a858054
Daniel Sandler [Thu, 29 Sep 2011 19:50:12 +0000 (15:50 -0400)]
Bring back nyandroid ADB icon.
Change-Id: Ic1124ef985aa8b7912499b7ff1c150fe982b882d
Daniel Sandler [Thu, 29 Sep 2011 19:44:34 +0000 (15:44 -0400)]
Add carrier info back to notification drawer.
Bug:
5250214
Change-Id: I9ef1faf052ea6e4d3bd0b5a1a6e67a18fb923c47
Fabrice Di Meglio [Thu, 29 Sep 2011 19:44:16 +0000 (12:44 -0700)]
Fix bug #
5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
- make DynamicLayout honor max lines
- make StaticLayout.generate() take maxLines as a parameter instead of using the field mMaximumVisibleLineCount
Change-Id: I9eafb1be4b8bb2aa881514955a6903f559cb6a1e
Mike Cleron [Thu, 29 Sep 2011 19:36:55 +0000 (12:36 -0700)]
Merge "Fix lockscreen Bug:
5391404"
Justin Ho [Thu, 29 Sep 2011 19:33:28 +0000 (12:33 -0700)]
Fix lockscreen
Bug:
5391404
Change-Id: I021a37705b72ab1990f7651fecbe743a8af4e372
Daniel Sandler [Thu, 29 Sep 2011 18:57:23 +0000 (11:57 -0700)]
Merge "Increase padding in notifications."
Dianne Hackborn [Thu, 29 Sep 2011 18:53:32 +0000 (11:53 -0700)]
Dianne Hackborn [Thu, 29 Sep 2011 18:53:31 +0000 (11:53 -0700)]
am
1fd6c336: (-s ours) Fix issue #
5312624: Lock screen very flickery
* commit '
1fd6c33620171893b2e92c38b731fd89e5a8dd66':
Fix issue #
5312624: Lock screen very flickery
Daniel Sandler [Thu, 29 Sep 2011 14:51:06 +0000 (10:51 -0400)]
Increase padding in notifications.
Bug:
5388349
Change-Id: I2649826a7244872bf0ebf1688ac695f38c6c2edf
Roman Nurik [Thu, 29 Sep 2011 18:35:13 +0000 (11:35 -0700)]
Add 'updated' banner in guide TOC for media formats, rename Widgets design guide to App Widgets design guide
Change-Id: Ie84a534f9893b773342c63e260774f26d9353b40
Dima Zavin [Tue, 27 Sep 2011 06:31:27 +0000 (23:31 -0700)]
eventhub: print debugginf info when removing device
Change-Id: I40bbbd3867e8c7ac7d6fb38e1c72432bb4963316
Signed-off-by: Dima Zavin <dima@android.com>
Kenny Root [Thu, 29 Sep 2011 18:00:41 +0000 (11:00 -0700)]
Add DUMP permission checks to services
Some services have info that is not readily available any other way. Add
a permission check to those services.
Bug:
5389201
Change-Id: I5a9724ec89e1c11ef7813eeb52a6a05b3ea92af5
Gilles Debunne [Thu, 29 Sep 2011 17:59:59 +0000 (10:59 -0700)]
Bug
5384535: Underline for typo even if there are no suggestions
Change-Id: I63f78227a3a80c5fdb97b1d5d8d6c595a70e1990
Gilles Debunne [Thu, 29 Sep 2011 17:55:36 +0000 (10:55 -0700)]
Bug
5254884: suggestions are no logner copied in the clipboard
Change-Id: I621c5b4da4252876b0f424e895a4e19e2a4dda50
Lorenzo Colitti [Thu, 29 Sep 2011 17:52:28 +0000 (10:52 -0700)]
Merge "Revert "Tell the resolver what protocols to use.""
Gilles Debunne [Thu, 29 Sep 2011 17:33:19 +0000 (10:33 -0700)]
Bug
5384675: Color in add to dictionary
Change-Id: Ibb89265a90d6b598927dec2bcf45a8c02388b5f0
Dianne Hackborn [Thu, 29 Sep 2011 17:21:27 +0000 (10:21 -0700)]
am
6ea4da95: (-s ours) Fix issue #
5242779: Device not responding to touch on unlock screen
* commit '
6ea4da95d9093dbfabe79321087b81cd7fbf5e84':
Fix issue #
5242779: Device not responding to touch on unlock screen
Gilles Debunne [Thu, 29 Sep 2011 17:21:18 +0000 (10:21 -0700)]
Merge "Bug
5278473 &
5278471: delete option in suggestion popup menu"
Gilles Debunne [Thu, 29 Sep 2011 17:20:46 +0000 (10:20 -0700)]
Merge "Too many SpellCheckSpans are created."
Guang Zhu [Thu, 29 Sep 2011 17:14:27 +0000 (10:14 -0700)]
Merge "Revert "log stack trace when finish() or onDestroy() is called""
Marco Nelissen [Thu, 29 Sep 2011 17:11:34 +0000 (10:11 -0700)]
Merge "Release MediaPlayer before letting it go out of scope."
Marco Nelissen [Thu, 29 Sep 2011 16:59:03 +0000 (09:59 -0700)]
Release MediaPlayer before letting it go out of scope.
Change-Id: Ib2b727146f6cba91b131e66d218251f5a3206fac
Jean-Michel Trivi [Thu, 29 Sep 2011 16:09:37 +0000 (09:09 -0700)]
Merge "Fix bug
5357295 NPE on display when remote control client dies"
Justin Ho [Thu, 29 Sep 2011 15:58:50 +0000 (08:58 -0700)]
Merge "Re-adding missing lockscreen drawable"
Justin Ho [Thu, 29 Sep 2011 15:53:45 +0000 (08:53 -0700)]
Re-adding missing lockscreen drawable
Change-Id: I895b36b77ea35ffacdfe4a2b9b4c58de9bd01472
Chet Haase [Thu, 29 Sep 2011 14:47:16 +0000 (07:47 -0700)]
Merge "Fixed ProgressBar logic for AnimationDrawables"
The Android Automerger [Thu, 29 Sep 2011 13:29:20 +0000 (06:29 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Steve Block [Thu, 29 Sep 2011 11:09:45 +0000 (04:09 -0700)]
Merge "Fix HTML5Audio to call WebView.isPrivateBrowsingEnabled() on the UI thread"
Luca Zanolin [Thu, 29 Sep 2011 08:09:47 +0000 (01:09 -0700)]
Merge "Change the width of the suggestion item to match the one of the suggestion pop-up"