OSDN Git Service
David Hu [Sun, 13 May 2012 00:01:39 +0000 (17:01 -0700)]
Allow tests to run when bandwidth profiling fails
When bandwidth profiling fails due to lack of kernel module
the test should still be able to run.
Change-Id: Ib111989d2892b05c147889e562e77035fab05140
Adam Cohen [Wed, 2 May 2012 17:38:01 +0000 (10:38 -0700)]
Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev
Matthew Xie [Wed, 2 May 2012 17:15:00 +0000 (10:15 -0700)]
Merge "Check null of address in onDeviceCreated" into jb-dev
Adam Cohen [Wed, 2 May 2012 01:10:28 +0000 (18:10 -0700)]
Changing app widget "extras" to "options" and another small API Review issue
-> (issue
6427146), (issue
6427861)
Change-Id: Ib69a9b3717a5b62317ec227936bc3b2fd5954043
satok [Wed, 2 May 2012 08:41:23 +0000 (01:41 -0700)]
Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev
satok [Wed, 25 Apr 2012 13:47:12 +0000 (22:47 +0900)]
DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
Bug:
5137498
Change-Id: Ieb8fd700d193eddaa31b0c5ebd8c7f7885586372
Adam Powell [Wed, 2 May 2012 02:10:32 +0000 (19:10 -0700)]
Merge "API modifications for TaskStackBuilder" into jb-dev
Jeff Brown [Wed, 2 May 2012 02:09:44 +0000 (19:09 -0700)]
Merge "Use EVIOCSCLOCKID correctly." into jb-dev
Adam Powell [Wed, 2 May 2012 01:09:32 +0000 (18:09 -0700)]
API modifications for TaskStackBuilder
Change-Id: Ic9e11caa4541962d32b2c197f4f7b19ee67a0eda
Jeff Brown [Wed, 2 May 2012 01:41:26 +0000 (18:41 -0700)]
Use EVIOCSCLOCKID correctly.
Bug:
6382031
Change-Id: I87b0887ce867a79758bcd24e2202280270faaf8c
Jeff Brown [Wed, 2 May 2012 01:39:00 +0000 (18:39 -0700)]
Merge "Improve handling of built-in keyboard." into jb-dev
Svetoslav Ganov [Wed, 2 May 2012 01:16:16 +0000 (18:16 -0700)]
Accessibility focus should not affect the currently active window.
1. The event of setting an accessibility focus on a view should not
make the host window the currently active one.
bug:
6400648
Change-Id: Ib45c255f441c38489ee9d4ab5f284550ac5f6b01
Matthew Xie [Wed, 2 May 2012 00:15:10 +0000 (17:15 -0700)]
Check null of address in onDeviceCreated
address can be null that returned from getAddressFromObjectPath.
If it is null case, donot continue call getRemoteDeviceProperties.
Otherwise it causes null pointer exception and crash the system.
Bug
6338780
Change-Id: Ib190342032ab2ad11c49f44fa6d4b2509a861514
Jeff Brown [Tue, 1 May 2012 22:54:03 +0000 (15:54 -0700)]
Improve handling of built-in keyboard.
The window manager policy made some incorrect assumptions about the
meaning of the Configuration.keyboard field. We need to be more
careful about distinguishing between built-in and external keyboards.
Most of this change is to move the determination of the parts of
the Configuration related to input devices into the WindowManagerService
leveraging new features of the InputManagerService to good effect.
Then we plumb through the flag that indicates whether a device
is internal or external so that we can be more particular about
how the lid switch effects changes to the Configuration.
Bug:
6424373
Change-Id: I36a1c22ade35e578955465a25940a33f227b9763
Jeff Sharkey [Tue, 1 May 2012 23:32:38 +0000 (16:32 -0700)]
Merge "Catch CCE when migrating to ClipData." into jb-dev
Eric Laurent [Tue, 1 May 2012 23:29:39 +0000 (16:29 -0700)]
Merge "AudioManager: deprecate vibrate settings" into jb-dev
Eric Laurent [Tue, 1 May 2012 18:23:07 +0000 (11:23 -0700)]
AudioManager: deprecate vibrate settings
Deprecate methods, intent and constants related to vibrate
settings management: getVibrateSetting(), setVibrateSetting(),
shouldVibrate() ...
According to new vibrate/notification policy, applications should
maintain their own vibrate settings.
Issue
6036529.
Change-Id: I99bcef2c5f602131f1d9b0222f7fb39f3bbef823
Philip Milne [Tue, 1 May 2012 23:21:15 +0000 (16:21 -0700)]
Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev
Gilles Debunne [Tue, 1 May 2012 23:19:40 +0000 (16:19 -0700)]
Merge "API fix in CheckedTextView" into jb-dev
Chris Craik [Tue, 1 May 2012 23:01:58 +0000 (16:01 -0700)]
Merge "fix monkey scrolling crash" into jb-dev
Stephen Hines [Tue, 1 May 2012 22:54:37 +0000 (15:54 -0700)]
Merge "Start passing element/dim information along with FieldPacker." into jb-dev
Stephen Hines [Tue, 1 May 2012 22:54:16 +0000 (15:54 -0700)]
Merge "Unhide FONT." into jb-dev
Stephen Hines [Tue, 1 May 2012 22:54:10 +0000 (15:54 -0700)]
Merge "Move mesh to end of test list until we fix LLVM." into jb-dev
Chris Craik [Tue, 1 May 2012 22:07:39 +0000 (15:07 -0700)]
fix monkey scrolling crash
bug:
6336994
Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/186186/
Change-Id: Ib019ca68f6e57f98e30b022949c624bab4695294
Guang Zhu [Tue, 1 May 2012 22:47:28 +0000 (15:47 -0700)]
Merge "remove extra semi colon" into jb-dev
Adam Cohen [Tue, 1 May 2012 22:36:21 +0000 (15:36 -0700)]
Merge "Preventing onClickPendingIntents from being set on collection widget items (issue
5961701)" into jb-dev
Philip Milne [Tue, 1 May 2012 21:39:37 +0000 (14:39 -0700)]
Fix for layout parameter validation bug in GridLayout.
Bug
6404882.
When a cell has an unspecified row and a column that is specified as greater
than the specified number of columns, GridLayout fails to report or correct
the error and loops indefinitely searching for a valid row to place the cell.
There is a cyclic dependency between the validation of layout parameters
(and allocation of undefined cell indexes) and the maximum column/row counts.
A performance optimization in layout paramter allocation caused this dependency
to be handled in correctly. The problem is fixed in this CL for this bug and
the symmetric problem for rows.
Change-Id: I0392343bc8a721a0ca7163f58f233ba8046c22e2
Amith Yamasani [Tue, 1 May 2012 20:57:53 +0000 (13:57 -0700)]
Merge "Fix a bug in appwidget migration to multiuser directory." into jb-dev
Amith Yamasani [Tue, 1 May 2012 20:48:48 +0000 (13:48 -0700)]
Fix a bug in appwidget migration to multiuser directory.
Bug:
6393606
Migrate the old appwidgets.xml if the file doesn't exist,
not if the directory doesn't exist. It worked earlier because
this was the first service that I migrated to multi-user :(
Change-Id: I59bcbc31ff9d101e44dff5e5f44b3cab8f08dc06
Eric Fischer [Tue, 1 May 2012 20:42:13 +0000 (13:42 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
James Dong [Tue, 1 May 2012 20:34:28 +0000 (13:34 -0700)]
Merge "Add video scaling mode support with a new public method in MediaPlayer.java class" into jb-dev
Andreas Huber [Tue, 1 May 2012 20:32:18 +0000 (13:32 -0700)]
Merge "Make java constants consistent with native counterparts." into jb-dev
Chris Craik [Tue, 1 May 2012 20:22:08 +0000 (13:22 -0700)]
Merge "Revert "Add header for forward compatibility"" into jb-dev
Jeff Sharkey [Tue, 1 May 2012 20:07:01 +0000 (13:07 -0700)]
Catch CCE when migrating to ClipData.
Bug:
6231948
Change-Id: I51bc272d29a17881b3d4908fda549da20aa7e6b3
Adam Cohen [Tue, 1 May 2012 02:54:39 +0000 (19:54 -0700)]
Preventing onClickPendingIntents from being set on collection widget items (issue
5961701)
Change-Id: If60f98c5e1be66ca840cbd4953841ef2c57a012b
Daniel Sandler [Tue, 1 May 2012 19:58:09 +0000 (12:58 -0700)]
Merge "Move legacy menu key to bottom right on sw600dp." into jb-dev
Brian Colonna [Tue, 1 May 2012 19:54:02 +0000 (12:54 -0700)]
Merge "Fix
6395288: Added lock to avoid unbind race condition" into jb-dev
Steven Ross [Tue, 1 May 2012 19:49:28 +0000 (12:49 -0700)]
Merge "Don't show Face Unlock on initial boot fixes
6396685" into jb-dev
Andreas Huber [Tue, 1 May 2012 18:50:30 +0000 (11:50 -0700)]
Make java constants consistent with native counterparts.
Change-Id: I481dfc18c170b4c60682ef1b38b57e10fb73d004
James Dong [Sat, 28 Apr 2012 23:03:55 +0000 (16:03 -0700)]
Add video scaling mode support with a new public method in MediaPlayer.java class
o related-to-bug:
5454345
Change-Id: I379b679eb6dd87f47f87a58791a5d0c7251b3a74
Eric Fischer [Tue, 1 May 2012 19:19:31 +0000 (12:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50b9a3a66234f1570955532c6383570cade19232
Gilles Debunne [Tue, 1 May 2012 19:07:06 +0000 (12:07 -0700)]
API fix in CheckedTextView
Bug
6103310
Change-Id: Ic144ed99199a296df3ef1a16f59caff08af58fd9
Gilles Debunne [Tue, 1 May 2012 18:58:35 +0000 (11:58 -0700)]
Merge "API fix, AutoCompleteTextView" into jb-dev
Gilles Debunne [Tue, 1 May 2012 18:58:26 +0000 (11:58 -0700)]
Merge "API fix in TextView" into jb-dev
Michael Jurka [Tue, 1 May 2012 18:47:36 +0000 (11:47 -0700)]
Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug
6104219)"" into jb-dev
Winson Chung [Tue, 1 May 2012 18:46:09 +0000 (11:46 -0700)]
Revert "Adding getters/setters for StackView xml attrs. (Bug
6104219)"
This reverts commit
7ced8f9cabfed2e11c125a1a6b4ff18f1cc50060
Chris Craik [Tue, 1 May 2012 18:20:20 +0000 (11:20 -0700)]
Revert "Add header for forward compatibility"
GPL build fix mistakenly merged into master
This reverts commit
fd862e9828d544f593a622f2914d1257366ae802.
Dianne Hackborn [Tue, 1 May 2012 18:15:51 +0000 (11:15 -0700)]
Merge "Add new APIs for permission group flags and priorities." into jb-dev
Chet Haase [Tue, 1 May 2012 18:11:52 +0000 (11:11 -0700)]
Merge "Fix launcher invisibility bug" into jb-dev
Winson Chung [Tue, 1 May 2012 17:55:14 +0000 (10:55 -0700)]
Merge "Adding getters/setters for StackView xml attrs. (Bug
6104219)" into jb-dev
Daniel Sandler [Tue, 1 May 2012 17:50:29 +0000 (13:50 -0400)]
Move legacy menu key to bottom right on sw600dp.
It's too easy to press if it's *all* the way to the right,
though, so there a 2dp margin separating it from the bezel.
Bug:
6399312
Change-Id: If4ebcd4cfcee0c667bcc6142af86c04445f41fea
Eric Laurent [Tue, 1 May 2012 17:47:57 +0000 (10:47 -0700)]
Merge "fix unmute from volume panel on tablets" into jb-dev
James Dong [Tue, 1 May 2012 17:24:46 +0000 (10:24 -0700)]
Merge "Fix a race condition in Camera API for handling focus" into jb-dev
Amith Yamasani [Tue, 1 May 2012 17:22:01 +0000 (10:22 -0700)]
Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev
George Mount [Tue, 1 May 2012 17:10:16 +0000 (10:10 -0700)]
Merge "Fix flicker while selecting text." into jb-dev
Eric Laurent [Tue, 1 May 2012 17:03:38 +0000 (10:03 -0700)]
fix unmute from volume panel on tablets
Changing STREAM_MUSIC from volume panel on tablets should exit silent
mode as does changing STREAM_RING on phones.
Issue
5970208.
Change-Id: Ia8ed62033da07a5d4dfcfa84b0b47b27414bdd9a
Chet Haase [Tue, 1 May 2012 17:05:13 +0000 (10:05 -0700)]
Fix launcher invisibility bug
There was a bug in the DisplayList code for layers where we would
set the alpha value for a layer only if the alpha were non-1. This works
most of the time (since the value is usually 1 and doesn't need to
be set at all, and if the value is non-1, it is set correctly). But when
the value has been set to a non-1 value, setting alpha back to 1 cannot happen
due to this logic. This caused launcher to have some invisible pages when
returning to Home because those pages previously had an alpha value of 0, and
setting the alpha to 1 had no effect due to this DisplayList code.
The fix is to simply remove the check for non-1 values; we should
always set the alpha value of layers to handle all cases.
Issue #
6413892 alpha value is messed up after AlphaAnimation
Change-Id: Ia51acb2eaaf0609ea7189998ed449bdd9ea7e05f
Jean-Michel Trivi [Tue, 1 May 2012 15:57:18 +0000 (08:57 -0700)]
Merge "Optimize how AudioService receives media button events" into jb-dev
George Mount [Tue, 1 May 2012 15:37:58 +0000 (08:37 -0700)]
Fix flicker while selecting text.
Bug
6413113
Change-Id: I5c8d2cda1eae9d5670c757711c49ccc9e47b4127
Steven Ross [Fri, 27 Apr 2012 18:26:17 +0000 (14:26 -0400)]
Don't show Face Unlock on initial boot fixes
6396685
Uses a static to keep track whether this is the first pass through the lockscreen
This will be true from when the process is instantiated until the lockscreen
is constructed for the first time, and then false afterwards.
When it is true, we suppress the biometric unlock (Face Unlock).
This avoids the problem of unpredictable and slow startup behavior for Face Unlock
on the first unlock after boot.
Change-Id: I70033af17ba3163d5fe07fc58096f01afaaaafd0
Stephen Hines [Fri, 20 Apr 2012 21:26:06 +0000 (14:26 -0700)]
Start passing element/dim information along with FieldPacker.
BUG=
6009244
Change-Id: I3c82c8b40c899b875831f53cf0ad82ea36c1a043
Stephen Hines [Mon, 30 Apr 2012 23:36:04 +0000 (16:36 -0700)]
Unhide FONT.
Change-Id: I86258076817bb8f34ce3bb76031df41c08750f8c
Stephen Hines [Tue, 1 May 2012 02:50:13 +0000 (19:50 -0700)]
Move mesh to end of test list until we fix LLVM.
Change-Id: I8f06e80d7cea4b51e47625186e45ad44adb45b6b
satok [Tue, 1 May 2012 05:02:07 +0000 (22:02 -0700)]
Merge "Show ongoing ime switch icon on sw600" into jb-dev
Gilles Debunne [Tue, 1 May 2012 02:26:19 +0000 (19:26 -0700)]
API fix in TextView
Bug
6104140
Change-Id: I44af54ac7c194335a649e5878ff47dc894fa46fe
satok [Tue, 1 May 2012 03:05:12 +0000 (12:05 +0900)]
Show ongoing ime switch icon on sw600
Bug:
6422307
Change-Id: If10758e0d4ca59da4f3ab07d52dda6673af9c0a8
Winson Chung [Tue, 1 May 2012 00:26:36 +0000 (17:26 -0700)]
Adding getters/setters for StackView xml attrs. (Bug
6104219)
Change-Id: Iaa1ba0292b0d40f73e315028d9f01ef407021e57
Guang Zhu [Tue, 1 May 2012 01:29:23 +0000 (18:29 -0700)]
remove extra semi colon
Eclipse has been complaining about it...
Change-Id: I39fb4eeab26af883dd2287baf49ec244db453365
Dianne Hackborn [Tue, 1 May 2012 01:29:20 +0000 (18:29 -0700)]
Merge "Fix issue #
6234928: android.app.IntentReceiverLeaked:" into jb-dev
Adam Powell [Tue, 1 May 2012 01:23:49 +0000 (18:23 -0700)]
Merge "Fix a bug in ListView where touch scrolling could skip a data set change" into jb-dev
Dianne Hackborn [Mon, 30 Apr 2012 23:33:56 +0000 (16:33 -0700)]
Add new APIs for permission group flags and priorities.
Change-Id: I2d476c6aa9dbd05407ec49be45986f42d2acf9e7
Gilles Debunne [Mon, 30 Apr 2012 23:44:14 +0000 (16:44 -0700)]
API fix, AutoCompleteTextView
Bug
6102885
Didn't fix dropDownSelector nor completionHintView at that point.
Change-Id: If080cbefd5189b79e4fa042e28dfa6a71524b93d
Ruei-sung Lin [Tue, 1 May 2012 00:55:09 +0000 (17:55 -0700)]
Merge "Fix b/
5821633: Could not activate GLEnvironment" into jb-dev
Jean-Michel Trivi [Mon, 30 Apr 2012 18:15:03 +0000 (11:15 -0700)]
Optimize how AudioService receives media button events
AudioService maintains a stack of registered media button event
receivers.
This change modifies the broadcasters of ACTION_MEDIA_BUTTON intents
let AudioService directly handle the corresponding key event instead
of trapping the intent sent by PhoneWindowManager, KeyguardViewBase
and PhoneFallbackEventHandler.
Because the key event may be sent through a PendingIntent,
AudioService now also implements the OnFinished interface to be
notified when the event was consumed so it can release the wake
lock held if it was held when the key event needed to be sent
(see where PassHeadsetKey was instanciated in PhoneWindowManager).
Change-Id: I2e8614df94af9d54edbf714ef443cc372d21827a
Svetoslav Ganov [Tue, 1 May 2012 00:39:47 +0000 (17:39 -0700)]
Merge "AccessibilityNodeInfo.getActionSymbolicName() is missing A11y focus actions." into jb-dev
Svetoslav Ganov [Tue, 1 May 2012 00:39:24 +0000 (17:39 -0700)]
Merge "Accessibility should not change input focus behavior." into jb-dev
Jeff Brown [Tue, 1 May 2012 00:28:49 +0000 (17:28 -0700)]
Merge "Fix Javadoc." into jb-dev
Jeff Sharkey [Tue, 1 May 2012 00:22:05 +0000 (17:22 -0700)]
Merge "Clear ident in dismissKeyguardOnNextActivity()." into jb-dev
Jeff Sharkey [Tue, 1 May 2012 00:19:35 +0000 (17:19 -0700)]
Merge "Add permission for NetworkOverLimitActivity." into jb-dev
Ruei-sung Lin [Tue, 1 May 2012 00:16:44 +0000 (17:16 -0700)]
Fix b/
5821633: Could not activate GLEnvironment
Change-Id: I35a05eb24299b85a869b973599a091381369aac2
Jeff Brown [Tue, 1 May 2012 00:15:57 +0000 (17:15 -0700)]
Merge "Add support for using the lid switch to turn off the screen." into jb-dev
Jeff Sharkey [Tue, 1 May 2012 00:14:51 +0000 (17:14 -0700)]
Add permission for NetworkOverLimitActivity.
Bug:
6421080
Change-Id: Icefdf3da7a4a421d27aa1449ac01ea8ae1451d49
Jamie Gennis [Tue, 1 May 2012 00:13:45 +0000 (17:13 -0700)]
Merge "Surface: add JNI plumbing for setActiveRect." into jb-dev
Jeff Sharkey [Tue, 1 May 2012 00:06:09 +0000 (17:06 -0700)]
Merge "Roaming always metered, relax DHCP metered check." into jb-dev
Adam Powell [Mon, 30 Apr 2012 23:59:02 +0000 (16:59 -0700)]
Fix a bug in ListView where touch scrolling could skip a data set change
Bug
2597058
ListView's touch scrolling can query the adapter for new views. As we now
flush pending touch events before running layout/draw traversals (when we
normally bring ListView back in sync), this can now happen more often.
Resync data before executing a scroll if a data set change is pending.
Change-Id: I3e4eba4c2537911ba9cb3393ee4d9e68e46f84bb
Jeff Sharkey [Mon, 30 Apr 2012 23:59:05 +0000 (16:59 -0700)]
Clear ident in dismissKeyguardOnNextActivity().
BaseStatusBar uses this to launch activities over the insecure
lockscreen, so clear identity.
Bug:
6414983
Change-Id: Idf578923285ee1344e6e13e7f51e17a5f2005c75
Svetoslav Ganov [Mon, 30 Apr 2012 23:55:21 +0000 (16:55 -0700)]
AccessibilityNodeInfo.getActionSymbolicName() is missing A11y focus actions.
1. The new actions were not added to this helper method so it was
throwing an InvalidArgumentException.
bug:
6421059
Change-Id: I132348a50bb900ee19b95cc92c26ce47609ccb1c
Svetoslav Ganov [Mon, 30 Apr 2012 23:49:59 +0000 (16:49 -0700)]
Accessibility should not change input focus behavior.
1. Removed a change in the input focus behavior I forgot
to take out when submitted the main accessibility focus
patch. Ugh..
bug:
6320098
Change-Id: Id7942e8aac64ba4bf6df7e19f733fa70b368d1bb
Andreas Huber [Mon, 30 Apr 2012 23:38:54 +0000 (16:38 -0700)]
Merge "New API to set the video rendering mode on a MediaCodec instance." into jb-dev
Dianne Hackborn [Mon, 30 Apr 2012 23:34:46 +0000 (16:34 -0700)]
Fix issue #
6234928: android.app.IntentReceiverLeaked:
Activity com.android.internal.app.ChooserActivity has leaked IntentReceiver
Change-Id: I02488931d8c02ecbe0c6fc2f7ce708a9dc406f67
Amith Yamasani [Mon, 30 Apr 2012 23:32:39 +0000 (16:32 -0700)]
Fixes PreferenceScreen padding and scrollbar position.
Bug:
6399996
Changed the scrollbarStyle for tablets
Bug:
6405440
Inflate the listview from a layout with padding.
Change-Id: I838bb073ee2f0e23ac7163cc632679278dbccf05
Jeff Brown [Mon, 30 Apr 2012 23:28:32 +0000 (16:28 -0700)]
Fix Javadoc.
Bug:
6418632
Change-Id: Ib17218c413cbdf26bab19ccd873de33e67dd3397
Jeff Sharkey [Mon, 30 Apr 2012 23:06:27 +0000 (16:06 -0700)]
Merge "Avoid showing popup when View detatched." into jb-dev
Jeff Sharkey [Mon, 30 Apr 2012 23:06:21 +0000 (16:06 -0700)]
Merge "Change permission enforcement through pm command." into jb-dev
Adam Powell [Mon, 30 Apr 2012 23:04:11 +0000 (16:04 -0700)]
Merge "Fix a bug with updating extras in a PendingIntent with an intent stack" into jb-dev
Jeff Sharkey [Mon, 30 Apr 2012 22:59:21 +0000 (15:59 -0700)]
Roaming always metered, relax DHCP metered check.
Always treat roaming connections as metered, and relax DHCP test to
match any substring for forward compatibility.
Bug:
6382737,
6375399
Change-Id: I9781a60f55fbe35da6f8bfc7a1d609608e8f0951
Michael Jurka [Mon, 30 Apr 2012 22:58:51 +0000 (15:58 -0700)]
Merge "Fix NPE" into jb-dev
Dianne Hackborn [Mon, 30 Apr 2012 22:58:22 +0000 (15:58 -0700)]
Merge "Fix issue #
6111771: Run-time Restart observed when signing in with an existing account" into jb-dev
Dianne Hackborn [Mon, 30 Apr 2012 22:57:30 +0000 (15:57 -0700)]
Merge "Fix scaling of layout bounds." into jb-dev
Michael Jurka [Mon, 30 Apr 2012 22:54:19 +0000 (15:54 -0700)]
Fix NPE