OSDN Git Service
Eino-Ville Talvala [Thu, 8 May 2014 21:33:49 +0000 (21:33 +0000)]
Merge "Add android.hardware.camera.external feature."
Svetoslav [Thu, 8 May 2014 21:19:01 +0000 (14:19 -0700)]
PrintManager should not crash if print fueature is not available.
Printing is one of the optional software features. If the device does not
have the feature, then the print APIs should do nothing. Before, a NPE
crash was happening.
bug:
14651902
Change-Id: I63efa75be51e8957ca6854b2b439918f01c0f154
Chris Craik [Thu, 8 May 2014 21:13:07 +0000 (21:13 +0000)]
Merge "Add logging utility methods"
Chris Craik [Thu, 8 May 2014 20:57:05 +0000 (13:57 -0700)]
Add logging utility methods
Change-Id: I0f316830dcc0bbf438292a6d0fbe9f8154368500
justinzhang [Thu, 8 May 2014 20:35:12 +0000 (20:35 +0000)]
Merge "DevicePolicyManager Authentication for Lock Task"
Jeff Brown [Thu, 8 May 2014 20:22:46 +0000 (20:22 +0000)]
Merge "Improve documentation of setOnFrameAvailableListener."
Jeff Brown [Thu, 8 May 2014 00:10:18 +0000 (17:10 -0700)]
Improve documentation of setOnFrameAvailableListener.
Change-Id: I970e5941f3f6975a284d18056238a6877c7acbf2
Dan Sandler [Thu, 8 May 2014 19:55:24 +0000 (19:55 +0000)]
Merge "Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows."
Emily Bernier [Thu, 8 May 2014 19:51:49 +0000 (19:51 +0000)]
Merge "New user restrictions for EDU"
Dan Sandler [Thu, 8 May 2014 18:52:10 +0000 (14:52 -0400)]
Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows.
We need to hide the bouncer when the lockscreen is occluded
by a show-when-locked window, but we also need to double-check
any time the screen comes on in case the bouncer has been
shown for some other reason since the occlusion originally
happened.
Bug:
14294001
Change-Id: Ief4ea8e39322d9c4b26ec217dbc14b6c6f16ad45
Craig Mautner [Thu, 8 May 2014 19:44:52 +0000 (19:44 +0000)]
Merge "Make ChooserActivity intents doccentric and transitory"
Craig Mautner [Thu, 8 May 2014 16:07:43 +0000 (09:07 -0700)]
Make ChooserActivity intents doccentric and transitory
Activities launched from the chooser activity will now appear in
their own tasks which will be automatically removed from recents
when they are finished.
Also qualified application of new flags with null check and
Action check. Must be either ACTION_SEND or ACTION_SEND_MULTIPLE.
Fixes bug
14463859.
Fixes bug
14633773.
Change-Id: I8832462163958f6a43bc4c6a020f78948ce70ac3
Winson Chung [Thu, 8 May 2014 19:37:18 +0000 (19:37 +0000)]
Merge "Listening for system changes to active recent tasks. (Bug
14260718)"
justinzhang [Mon, 24 Mar 2014 20:09:24 +0000 (16:09 -0400)]
DevicePolicyManager Authentication for Lock Task
Here we let DevicePolicyManager keep a list of tasks that are
allowed to start the lock task mode. This list can only be set by
a device owner app. The ActivityManager will call
DevicePolicyManager to check whether a given task can start the
lock task mode or not.
Change-Id: I650fdae43fc35bf9fd63452283f4e2bbadd11551
Bug:
14611303
Jose Lima [Thu, 8 May 2014 18:56:53 +0000 (18:56 +0000)]
Merge "Remove unecessary code from ActivityStack"
Eino-Ville Talvala [Thu, 8 May 2014 18:39:53 +0000 (11:39 -0700)]
Add android.hardware.camera.external feature.
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.
Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.
Change-Id: I57497758877e4286c1f0116961731d483b56808f
Selim Gurun [Thu, 8 May 2014 18:48:52 +0000 (18:48 +0000)]
Merge "Cleanup a unused setting"
Selim Gurun [Thu, 8 May 2014 18:20:26 +0000 (11:20 -0700)]
Cleanup a unused setting
The old webview is not used anymore. Removing this setting.
Change-Id: I3f783eec195a2f11534bcff8243ce4d2c556a416
Ying Wang [Thu, 8 May 2014 18:31:18 +0000 (18:31 +0000)]
am
db55bb06: am
4463cbc6: am
3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '
db55bb0622e9fbe4b858d59409f516de01c1f1fd':
Remove unused LOCAL_LDLIBS.
Mindy Pereira [Thu, 8 May 2014 18:30:57 +0000 (18:30 +0000)]
am
101e3793: am
07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev
* commit '
101e379318a3869f64ea897a3f95a89243408c94':
Make distance count when dismissing swipedismisslayout
dmitrygr@google.com [Thu, 8 May 2014 18:30:53 +0000 (18:30 +0000)]
am
90cfa001: (-s ours) resolved conflicts for merge of
5ae1c4f7 to klp-modular-dev-plus-aosp
* commit '
90cfa0011243b5461644f4182a0d76d63e41610d':
DO NOT MERGE: change preloaded classes
Jason Monk [Thu, 8 May 2014 17:52:58 +0000 (17:52 +0000)]
Merge "Fix Global Proxy when used with PAC"
Jason Monk [Mon, 28 Apr 2014 18:57:27 +0000 (14:57 -0400)]
Fix Global Proxy when used with PAC
Since PAC needs to relay the local proxy port back to the
ConnectivityService it ends up calling handleApplyDefaultProxy...
This works fine for PAC on WiFi, but when tested on global proxy
(not currently used anywhere), it sets the mDefaultProxy. This
mDefaultProxy does not get cleared when the global proxy is cleared
and requires a reboot to get things cleared out.
This CL adds a check to overwrite mGlobalProxy rather than
mDefaultProxy in this use case.
Change-Id: I92782d11e213b91f8ddda2faaf996a7252273fc3
ztenghui [Tue, 6 May 2014 18:07:37 +0000 (11:07 -0700)]
Further cleaning on animated part of VectorDrawable.
State changed support is gone.
Rename VAnimatedPath.
Remove the obsolete documents.
Update the tests to reflect the API changes.
Change-Id: Icdc19c6519a4e29975877c1d167e61c8fa14a371
Jose Lima [Mon, 5 May 2014 22:59:40 +0000 (15:59 -0700)]
Remove unecessary code from ActivityStack
- Due to a previous CL to allow activities to be visible under
the Home stack, some code un ActivityStack became unecessary.
- This CL removes the uused code and changes the interface of
ensureActivitiesVisibleLocked, since we no longer need to
special case visibility for the Home stack.
Change-Id: I5cffe903bc82041fe79bfc63107df71ddf01232c
Jean-Michel Trivi [Thu, 8 May 2014 17:06:32 +0000 (17:06 +0000)]
Merge "Fix javadoc reference in AudioTrack write modes"
Jean-Michel Trivi [Thu, 8 May 2014 16:57:00 +0000 (09:57 -0700)]
Fix javadoc reference in AudioTrack write modes
Javadoc for blocking/non blocking write modes was referring
to the old signature of one of the write methods.
Change-Id: Ie919e3e0a976b0c915dacd490ae66005703789a3
George Mount [Thu, 8 May 2014 16:58:17 +0000 (16:58 +0000)]
Merge "Fix mismatch in Transition ID/instances"
Jean-Michel Trivi [Thu, 8 May 2014 15:58:45 +0000 (15:58 +0000)]
Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer"
Derek Sollenberger [Thu, 8 May 2014 14:41:46 +0000 (14:41 +0000)]
Merge "Avoid caching shadow properties in Java & HWUI."
Baligh Uddin [Thu, 8 May 2014 14:37:44 +0000 (14:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 8 May 2014 14:37:37 +0000 (14:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Selim Cinek [Thu, 8 May 2014 13:35:03 +0000 (13:35 +0000)]
Merge "Improved animation logic of the new notifications"
Selim Cinek [Thu, 8 May 2014 13:12:05 +0000 (15:12 +0200)]
Improved animation logic of the new notifications
Scrolling and other local updates work much better now when an
animation is already in place.
Change-Id: I602899bc75ae132ebb30591e723be3f00f744e18
Jorim Jaggi [Thu, 8 May 2014 13:04:34 +0000 (13:04 +0000)]
Merge "Fix crash in ActivatableNotificationView."
Jorim Jaggi [Thu, 8 May 2014 12:55:48 +0000 (14:55 +0200)]
Fix crash in ActivatableNotificationView.
Change-Id: Ifc431333bcf0b0d2ade81730c9ffc935218e5cc0
Kenny Guy [Thu, 8 May 2014 12:54:39 +0000 (12:54 +0000)]
Merge "Limit package launcher apps callback to enabled users."
Sander Alewijnse [Thu, 8 May 2014 12:49:10 +0000 (12:49 +0000)]
Merge "Add API to disable account management for certain types of accounts."
Amith Yamasani [Thu, 8 May 2014 12:22:02 +0000 (12:22 +0000)]
Merge "Send boot_completed for users started in the background"
Dan Sandler [Thu, 8 May 2014 11:30:46 +0000 (11:30 +0000)]
Merge "Quantum notification improvements."
Sander Alewijnse [Wed, 7 May 2014 09:46:57 +0000 (10:46 +0100)]
Add API to disable account management for certain types
of accounts.
The account types with disabled account management are stored in a
blacklist in the active admin object, editable by profile owners.
Change-Id: I57dc5f709ad79674fa28dd006969283585daea24
Neil Fuller [Thu, 8 May 2014 10:28:24 +0000 (10:28 +0000)]
Merge "Unhide further 1.7-era APIs"
Christoph Studer [Thu, 8 May 2014 10:21:14 +0000 (10:21 +0000)]
Merge "Record notification events to a local SQLite DB"
Vinit Deshapnde [Thu, 8 May 2014 10:05:45 +0000 (10:05 +0000)]
Merge "Remove reference to WifiScanner till the API is made public"
Neil Fuller [Thu, 8 May 2014 09:49:37 +0000 (10:49 +0100)]
Unhide further 1.7-era APIs
Related to change: I15ef2991b03a9503d6917a7f3351b32f42f662fb
Change-Id: Ie8185f78c749c3d48195c6943ebfe1cd7b3b8280
Vinit Deshapnde [Thu, 8 May 2014 09:45:12 +0000 (02:45 -0700)]
Remove reference to WifiScanner till the API is made public
Change-Id: I0cb2be4338ce59e1d12f83a94edc5de39810b18a
Jessica Hummel [Thu, 8 May 2014 09:40:12 +0000 (09:40 +0000)]
Merge "Disallow the INTERACT_ACROSS_USERS permission for system apps"
Christoph Studer [Wed, 16 Apr 2014 13:05:56 +0000 (15:05 +0200)]
Record notification events to a local SQLite DB
Bug:
13672846
Change-Id: I911573ba943487b3f4f18349d318215bd183d991
Vinit Deshapnde [Thu, 8 May 2014 08:22:59 +0000 (08:22 +0000)]
Merge "Initial implementation of WifiScanner"
Dan Sandler [Tue, 6 May 2014 14:01:27 +0000 (10:01 -0400)]
Quantum notification improvements.
New API introduced here: Notification.color (and
Builder.setColor()), allowing apps to specify an accent
color to be used by the template. The Quantum templates
(which are now the only kind we support) use this when
creating a circular background to draw behind the smallIcon
in the expanded form.
Additionally, the quantum and legacy templates are no longer
in superposition; all apps using Builder will get quantum.
Change-Id: Iac5e2645cc5c2346ed458763f2280ae9c6368b62
Dan Sandler [Thu, 8 May 2014 05:20:22 +0000 (05:20 +0000)]
Merge "L: WIP."
Dan Sandler [Tue, 6 May 2014 20:47:35 +0000 (16:47 -0400)]
L: WIP.
Change-Id: I9e2656c9df95a2e0ed236291419bbc4635ec97d7
Vinit Deshapnde [Thu, 8 May 2014 04:09:11 +0000 (21:09 -0700)]
Initial implementation of WifiScanner
This change implements basic functionality of WifiScanner. Following
functionality is enabled
1. Scanning - specify a list of channels to scan
2. Significant change detection
3. AP hotlist
Change-Id: Ieef75b96bdbbd3c7d9b9e698bd16e64d3b465254
vandwalle [Thu, 8 May 2014 03:03:02 +0000 (03:03 +0000)]
Merge "initial Best Network Selection implementation"
Craig Mautner [Thu, 8 May 2014 02:24:01 +0000 (02:24 +0000)]
Merge "Account for windows on non-app display."
vandwalle [Tue, 1 Apr 2014 02:12:07 +0000 (19:12 -0700)]
initial Best Network Selection implementation
-add dhcpserver, defaultGwMAC address, linked configuration and user choices link lists to WiFiconfiguration
-add default gateway mac address to RouteInfo
-add a Date to the ScanResult
-add BSSID date to the WifiConfiguration
- make framework auto-join into a config option
- add Settings option for showing RSSI in Wifi picker view; add auto-join specific status to WifiConfiguration
Change-Id: I5cfc4f2a48c9f3bc9766e8e68e24eff7b57f2821
Changes to be committed:
modified: core/java/android/provider/Settings.java
modified: wifi/java/android/net/wifi/ScanResult.java
modified: wifi/java/android/net/wifi/WifiConfiguration.java
Jorim Jaggi [Thu, 8 May 2014 01:22:55 +0000 (01:22 +0000)]
Merge changes Idc1e6e52,If1729a01
* changes:
Allow different animation lengths in StackStateAnimator.
Only handle scroll events when over content.
Jorim Jaggi [Wed, 7 May 2014 19:42:40 +0000 (21:42 +0200)]
Allow different animation lengths in StackStateAnimator.
Combine them using the maximum length.
Change-Id: Idc1e6e52f7f36ed46fbfba013c23773eeed95cd6
Jorim Jaggi [Thu, 8 May 2014 01:13:41 +0000 (01:13 +0000)]
Merge "Enable "More"-card double tap interaction."
Jorim Jaggi [Thu, 8 May 2014 01:13:30 +0000 (01:13 +0000)]
Merge "Introduce AmbientState for StackScroller."
Winson Chung [Thu, 8 May 2014 01:08:34 +0000 (18:08 -0700)]
Listening for system changes to active recent tasks. (Bug
14260718)
Jason Monk [Thu, 8 May 2014 01:00:54 +0000 (01:00 +0000)]
Merge "Fix Docs breakage"
Craig Mautner [Thu, 8 May 2014 00:59:54 +0000 (00:59 +0000)]
Merge "Use new doccentric flags and attributes in Sharing"
Jorim Jaggi [Wed, 7 May 2014 21:23:18 +0000 (23:23 +0200)]
Only handle scroll events when over content.
This makes sure that the unlock text is always shown when tapping
the bottom area.
Bug:
14381296
Change-Id: If1729a01dab21ddf0b93e665c85fd72ed399c0fd
Jorim Jaggi [Wed, 7 May 2014 19:10:35 +0000 (21:10 +0200)]
Enable "More"-card double tap interaction.
Bug:
14492098
Change-Id: I8b80df407df8b6df0af616932018e40e903a7966
Jorim Jaggi [Wed, 7 May 2014 17:41:13 +0000 (19:41 +0200)]
Introduce AmbientState for StackScroller.
AmbientState is a global state for the algorithm of the
StackScroller. Dimmed and which child is activated was moved
into this state. Further, scale and dimmed is also a
StackScrollState and animated in StackStateAnimator.
Change-Id: Ia68131cee62b2e0005f55ea6dc400d149ec15278
Ying Wang [Thu, 8 May 2014 00:27:09 +0000 (00:27 +0000)]
am
4463cbc6: am
3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '
4463cbc61d0947eccb67a52f60661a92d0cad508':
Remove unused LOCAL_LDLIBS.
Russ Schnapp [Thu, 8 May 2014 00:24:09 +0000 (00:24 +0000)]
Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras"
Ying Wang [Thu, 8 May 2014 00:21:38 +0000 (00:21 +0000)]
am
3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '
3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
Remove unused LOCAL_LDLIBS.
Craig Mautner [Thu, 8 May 2014 00:20:56 +0000 (17:20 -0700)]
Use new doccentric flags and attributes in Sharing
Put the new doccentric flags and attributes into use. And make their
first application the Share widget. Sharing now creates a new task
which is destroyed once the share action has completed.
Fixes bug
14463859.
Change-Id: I34c4c79775ef44d65e1967be5601997a2d46b210
Ying Wang [Thu, 8 May 2014 00:15:13 +0000 (00:15 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Jason Sams [Thu, 8 May 2014 00:01:39 +0000 (00:01 +0000)]
Merge "Add flags to context creation for RS"
Alan Viverette [Wed, 7 May 2014 23:58:15 +0000 (23:58 +0000)]
Merge "State based animators for Views"
Yigit Boyar [Tue, 6 May 2014 23:56:08 +0000 (16:56 -0700)]
State based animators for Views
Set quantum theme buttons to elevate 2dp on press
Change-Id: Ibf4f5ef166b901382c304d392eba075836a96a35
Mindy Pereira [Wed, 7 May 2014 23:42:00 +0000 (23:42 +0000)]
am
07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev
* commit '
07763e305404bce16df500e1a65493d2f2b7d0c9':
Make distance count when dismissing swipedismisslayout
repo sync [Wed, 7 May 2014 23:34:51 +0000 (16:34 -0700)]
resolved conflicts for merge of
5ae1c4f7 to klp-modular-dev-plus-aosp
Change-Id: I4e1448af91c158e4b5a25577b9b392773d7d3bfc
Jason Monk [Wed, 7 May 2014 23:18:38 +0000 (19:18 -0400)]
Fix Docs breakage
This depends on another API which evidently has not been merged
yet, this change should be reverted once the API is available
to be linked.
Change-Id: I59cb76e158fc0fac68ebd1c0de48b55e52274805
John Reck [Wed, 7 May 2014 23:16:51 +0000 (23:16 +0000)]
Merge "Allow all loopers to be RT-accelerated"
Jason Monk [Wed, 7 May 2014 23:16:02 +0000 (23:16 +0000)]
Merge "Fix Docs breakage"
Vinod Krishnan [Wed, 7 May 2014 22:57:45 +0000 (22:57 +0000)]
am
03498d34: am
b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit '
03498d349ae3aa5e429e999b97036d194981373f':
Adding a HeartRate Feature
John Reck [Wed, 7 May 2014 22:45:47 +0000 (15:45 -0700)]
Allow all loopers to be RT-accelerated
Bug:
14445956
Change-Id: I03e92642aa118db5c7fefa1f09c3a5bde6ea671d
Mindy Pereira [Wed, 7 May 2014 22:46:02 +0000 (22:46 +0000)]
Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev
Florin Malita [Wed, 7 May 2014 22:44:46 +0000 (22:44 +0000)]
Merge "Encapsulate Canvas.mNativeCanvas"
Jason Monk [Wed, 7 May 2014 22:41:13 +0000 (18:41 -0400)]
Fix Docs breakage
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
Brian Carlstrom [Wed, 7 May 2014 22:21:14 +0000 (15:21 -0700)]
resolved conflicts for merge of
0b5598c9 to master
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
Ying Wang [Wed, 7 May 2014 22:23:37 +0000 (15:23 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
George Mount [Wed, 7 May 2014 00:19:14 +0000 (17:19 -0700)]
Fix mismatch in Transition ID/instances
Bug
14597573
In a Transition, when a View is removed from a Scene
and that View has an ID in common with another View
in the end Scene, it will be matched, even if the
View in the start Scene already had a matching View
by instance. This CL prevents a match by ID when an
instance match is available.
Future: disable matching when two views have the
same ID.
Change-Id: I0e51d1f2d0a2d05d09e8e135f090d0e1b2a67efc
Selim Gurun [Wed, 7 May 2014 22:08:31 +0000 (22:08 +0000)]
Merge "Fix build"
Brian Carlstrom [Wed, 7 May 2014 22:06:23 +0000 (22:06 +0000)]
Merge "resolved conflicts for merge of
3bbef521 to master"
Selim Gurun [Wed, 7 May 2014 22:04:40 +0000 (15:04 -0700)]
Fix build
Fix the java reflection to have the devices boot again.
Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
Winson Chung [Wed, 7 May 2014 22:04:15 +0000 (22:04 +0000)]
Merge "Disabling shadowing (until bugs are addressed) and refactoring some constants."
Winson Chung [Wed, 7 May 2014 22:01:14 +0000 (15:01 -0700)]
Disabling shadowing (until bugs are addressed) and refactoring some constants.
Change-Id: Iaf4c98bcb13441be3e66048687ea5b0673d2bce6
Baligh Uddin [Wed, 7 May 2014 21:56:32 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14399e867491e32386a481c24d98418be3f128b3
Auto-generated-cl: translation import
John Reck [Wed, 7 May 2014 21:48:19 +0000 (21:48 +0000)]
Merge "Cleanup attachFunctor"
Vinod Krishnan [Wed, 7 May 2014 21:46:45 +0000 (21:46 +0000)]
am
b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit '
b9d71fa1081dc318a811b60660009d0769c02971':
Adding a HeartRate Feature
Brian Carlstrom [Wed, 7 May 2014 21:46:40 +0000 (14:46 -0700)]
resolved conflicts for merge of
3bbef521 to master
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
Jorim Jaggi [Wed, 7 May 2014 21:43:12 +0000 (21:43 +0000)]
Merge "New layout structure for the expanded status bar."
Jim Miller [Wed, 7 May 2014 21:40:15 +0000 (21:40 +0000)]
am
424edf06: am
cc6b9eb2: am
92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions."
* commit '
424edf064fb705b07f5f7d41e875dd2b24ccf271':
Fix can't change airplane mode from GlobalActions.
Dmitry Grinberg [Wed, 7 May 2014 21:39:44 +0000 (21:39 +0000)]
Merge "DO NOT MERGE: change preloaded classes" into klp-modular-dev
John Reck [Wed, 7 May 2014 21:39:44 +0000 (14:39 -0700)]
Cleanup attachFunctor
Bug:
13961296
Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d