130588 Commits

Author SHA1 Message Date
Jeff Brown
3b1ae5e40b Merge "Improve documentation of setOnFrameAvailableListener." 2014-05-08 20:22:46 +00:00
Jeff Brown
ba873d2171 Improve documentation of setOnFrameAvailableListener.
Change-Id: I970e5941f3f6975a284d18056238a6877c7acbf2
2014-05-08 13:21:27 -07:00
Dan Sandler
12319badd6 Merge "Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows." 2014-05-08 19:55:25 +00:00
Emily Bernier
86e8029079 Merge "New user restrictions for EDU" 2014-05-08 19:51:50 +00:00
Dan Sandler
3806c77133 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
2014-05-08 19:46:42 +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
Winson Chung
8f17b57582 Merge "Listening for system changes to active recent tasks. (Bug 14260718)" 2014-05-08 19:37:19 +00:00
Jose Lima
ca0c0ba764 Merge "Remove unecessary code from ActivityStack" 2014-05-08 18:56:53 +00: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
Ying Wang
29894c6176 am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
  Remove unused LOCAL_LDLIBS.
2014-05-08 18:31:18 +00: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
dmitrygr@google.com
99350faf73 am 90cfa001: (-s ours) resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp
* commit '90cfa0011243b5461644f4182a0d76d63e41610d':
  DO NOT MERGE: change preloaded classes
2014-05-08 18:30:53 +00:00
Jason Monk
a2604b738e Merge "Fix Global Proxy when used with PAC" 2014-05-08 17:52:58 +00:00
Jason Monk
56cf1ab410 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
2014-05-08 13:46:26 -04:00
ztenghui
ddbbb8ae85 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
2014-05-08 10:16:34 -07:00
Jose Lima
729cb2391f 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
2014-05-08 10:15:05 -07:00
Jean-Michel Trivi
f73c8401a6 Merge "Fix javadoc reference in AudioTrack write modes" 2014-05-08 17:06:32 +00:00
Jean-Michel Trivi
8b520c8f8e 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
2014-05-08 17:01:40 +00:00
George Mount
764af2958b Merge "Fix mismatch in Transition ID/instances" 2014-05-08 16:58:18 +00:00
Jean-Michel Trivi
96567e2112 Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer" 2014-05-08 15:58:46 +00:00
Derek Sollenberger
5b554f0103 Merge "Avoid caching shadow properties in Java & HWUI." 2014-05-08 14:41:47 +00:00
Baligh Uddin
cf501a60b8 Merge "Import translations. DO NOT MERGE" 2014-05-08 14:37:44 +00:00
Baligh Uddin
dad349ed00 Merge "Import translations. DO NOT MERGE" 2014-05-08 14:37:37 +00:00
Selim Cinek
695015dd11 Merge "Improved animation logic of the new notifications" 2014-05-08 13:35:03 +00:00
Selim Cinek
8df56452cb 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
2014-05-08 15:25:40 +02:00
Jorim Jaggi
11b7a38139 Merge "Fix crash in ActivatableNotificationView." 2014-05-08 13:04:34 +00:00
Jorim Jaggi
bccb9123a5 Fix crash in ActivatableNotificationView.
Change-Id: Ifc431333bcf0b0d2ade81730c9ffc935218e5cc0
2014-05-08 15:04:10 +02:00
Kenny Guy
26ecbefea0 Merge "Limit package launcher apps callback to enabled users." 2014-05-08 12:54:39 +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
Amith Yamasani
63812fd9f2 Merge "Send boot_completed for users started in the background" 2014-05-08 12:22:02 +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
Neil Fuller
37a61c5e84 Merge "Unhide further 1.7-era APIs" 2014-05-08 10:28:25 +00:00
Christoph Studer
5dfbe24fc4 Merge "Record notification events to a local SQLite DB" 2014-05-08 10:21:14 +00:00
Vinit Deshapnde
e2679f09b1 Merge "Remove reference to WifiScanner till the API is made public" 2014-05-08 10:05:45 +00:00
Neil Fuller
c3eb973853 Unhide further 1.7-era APIs
Related to change: I15ef2991b03a9503d6917a7f3351b32f42f662fb

Change-Id: Ie8185f78c749c3d48195c6943ebfe1cd7b3b8280
2014-05-08 10:49:37 +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
Jessica Hummel
fbf53d042d Merge "Disallow the INTERACT_ACROSS_USERS permission for system apps" 2014-05-08 09:40:13 +00:00
Christoph Studer
1c3f81fde9 Record notification events to a local SQLite DB
Bug: 13672846
Change-Id: I911573ba943487b3f4f18349d318215bd183d991
2014-05-08 10:47:23 +02: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
c4bfcc12e9 Merge "initial Best Network Selection implementation" 2014-05-08 03:03:02 +00:00
Craig Mautner
221b336cc1 Merge "Account for windows on non-app display." 2014-05-08 02:24:02 +00: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
Jorim Jaggi
15560a84df Merge changes Idc1e6e52,If1729a01
* changes:
  Allow different animation lengths in StackStateAnimator.
  Only handle scroll events when over content.
2014-05-08 01:22:55 +00:00