Commit Graph

38674 Commits

Author SHA1 Message Date
Winson Chung
aca960204e Fixing NPE in accessing theme attribute.
Change-Id: I5d21645b5530f13e1709021bd818de6bdb1d6544
2014-05-09 16:18:55 -07:00
Winson Chung
6e05841950 Merge "Removing the old tasks on launching recents task if they trigger a new task." 2014-05-08 22:33:20 +00:00
Dianne Hackborn
6af7d62df8 Merge "Usage stats!" 2014-05-08 21:58:45 +00:00
Eino-Ville Talvala
2e58d6de06 Merge "Add android.hardware.camera.external feature." 2014-05-08 21:33:49 +00:00
Svetoslav
2235a1772f 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
2014-05-08 14:25:51 -07:00
Winson Chung
5393dff555 Removing the old tasks on launching recents task if they trigger a new task.
- Only kill processes when removing tasks that are not started as documents
- Tweaking thumbnail animation
2014-05-08 14:25:43 -07:00
Dianne Hackborn
e22b3b1432 Usage stats!
Start reworking the usage stats service to be able
to have an API we can publish.

The basic information it keeps is still the same, though
that will be changing in the future.  The one big addition
here is that we are also now collecting configuration usage
stats.

Also introduce the start of an access model for usage stats,
using app ops.  There is an new app op that gives an application
access to usage stats even if it normally wouldn't have it,
disabled by default.

Change-Id: I6ead28e18a7f08eafd057d6ff37dd9cb216358f4
2014-05-08 13:58:13 -07:00
justinzhang
ed32c842c6 Merge "DevicePolicyManager Authentication for Lock Task" 2014-05-08 20:35:12 +00:00
Emily Bernier
86e8029079 Merge "New user restrictions for EDU" 2014-05-08 19:51:50 +00:00
Craig Mautner
7486ae202f Merge "Make ChooserActivity intents doccentric and transitory" 2014-05-08 19:44:53 +00:00
Craig Mautner
411d2aed2b 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
2014-05-08 12:43:50 -07:00
justinzhang
511e0d8323 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
2014-05-08 15:00:14 -04:00
Eino-Ville Talvala
9131da28e1 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
2014-05-08 11:53:01 -07:00
Selim Gurun
6cab9b3814 Merge "Cleanup a unused setting" 2014-05-08 18:48:52 +00:00
Selim Gurun
57cee39d76 Cleanup a unused setting
The old webview is not used anymore. Removing this setting.

Change-Id: I3f783eec195a2f11534bcff8243ce4d2c556a416
2014-05-08 11:35:25 -07:00
Mindy Pereira
a3ef079aaf am 101e3793: am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev
* commit '101e379318a3869f64ea897a3f95a89243408c94':
  Make distance count when dismissing swipedismisslayout
2014-05-08 18:30:57 +00:00
George Mount
764af2958b Merge "Fix mismatch in Transition ID/instances" 2014-05-08 16:58:18 +00:00
Derek Sollenberger
5b554f0103 Merge "Avoid caching shadow properties in Java & HWUI." 2014-05-08 14:41:47 +00:00
Sander Alewijnse
5c082dd22f Merge "Add API to disable account management for certain types of accounts." 2014-05-08 12:49:10 +00:00
Dan Sandler
b325c80d3d Merge "Quantum notification improvements." 2014-05-08 11:30:46 +00:00
Sander Alewijnse
5c02db60be 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
2014-05-08 12:28:07 +01:00
Vinit Deshapnde
256daf0093 Remove reference to WifiScanner till the API is made public
Change-Id: I0cb2be4338ce59e1d12f83a94edc5de39810b18a
2014-05-08 02:45:12 -07:00
Vinit Deshapnde
b788d4eb01 Merge "Initial implementation of WifiScanner" 2014-05-08 08:22:59 +00:00
Dan Sandler
26e81cf14b 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
2014-05-08 01:21:55 -04:00
Dan Sandler
d30195a613 Merge "L: WIP." 2014-05-08 05:20:23 +00:00
Dan Sandler
c89deae0a7 L: WIP.
Change-Id: I9e2656c9df95a2e0ed236291419bbc4635ec97d7
2014-05-08 01:14:17 -04:00
Vinit Deshapnde
011e1b35a6 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
2014-05-07 21:14:24 -07:00
vandwalle
7c3606c103 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
2014-05-07 18:48:48 -07:00
Jason Monk
607562a766 Merge "Fix Docs breakage" 2014-05-08 01:00:54 +00:00
Craig Mautner
f12fca4ba5 Merge "Use new doccentric flags and attributes in Sharing" 2014-05-08 00:59:54 +00:00
Russ Schnapp
7359b0b885 Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras" 2014-05-08 00:24:10 +00:00
Craig Mautner
41db4a77fa 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
2014-05-07 17:20:56 -07:00
Alan Viverette
b466977765 Merge "State based animators for Views" 2014-05-07 23:58:15 +00:00
Yigit Boyar
f4c5bf30b4 State based animators for Views
Set quantum theme buttons to elevate 2dp on press

Change-Id: Ibf4f5ef166b901382c304d392eba075836a96a35
2014-05-07 16:52:17 -07:00
Mindy Pereira
101e379318 am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev
* commit '07763e305404bce16df500e1a65493d2f2b7d0c9':
  Make distance count when dismissing swipedismisslayout
2014-05-07 23:42:00 +00:00
Jason Monk
41a2e33744 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
2014-05-07 19:18:38 -04:00
John Reck
ae493d967f Merge "Allow all loopers to be RT-accelerated" 2014-05-07 23:16:52 +00:00
Jason Monk
fab0126136 Merge "Fix Docs breakage" 2014-05-07 23:16:02 +00:00
Vinod Krishnan
7d3387bc13 am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit '03498d349ae3aa5e429e999b97036d194981373f':
  Adding a HeartRate Feature
2014-05-07 22:57:45 +00:00
John Reck
030d619aaa Allow all loopers to be RT-accelerated
Bug: 14445956

Change-Id: I03e92642aa118db5c7fefa1f09c3a5bde6ea671d
2014-05-07 15:46:36 -07:00
Mindy Pereira
07763e3054 Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 2014-05-07 22:46:02 +00:00
Jason Monk
faf3fd59d5 Fix Docs breakage
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
2014-05-07 18:41:13 -04:00
George Mount
6de56bb07e 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
2014-05-07 15:09:08 -07:00
Brian Carlstrom
095652d3cb Merge "resolved conflicts for merge of 3bbef521 to master" 2014-05-07 22:06:24 +00:00
John Reck
ef27453cf7 Merge "Cleanup attachFunctor" 2014-05-07 21:48:20 +00:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
2014-05-07 21:46:45 +00:00
Brian Carlstrom
6422abef78 resolved conflicts for merge of 3bbef521 to master
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
2014-05-07 14:46:40 -07:00
John Reck
832b151465 Cleanup attachFunctor
Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
2014-05-07 14:39:44 -07:00
Zhijun He
bc01db42d5 Camera: remove some DNG tags
Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035
2014-05-07 21:33:23 +00:00
John Reck
b6d9211d31 Merge "Implement TODO(romainguy)" 2014-05-07 21:24:25 +00:00