134090 Commits

Author SHA1 Message Date
Jean-Michel Trivi
9b128af442 am 720f52c1: Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer"
* commit '720f52c13af94e73ffcb3156a6e0a9999d017637':
  Unhide AudioTrack.write() method for non-blocking and ByteBuffer
2014-05-08 16:04:07 +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
2714bdfdc1 am a5e12a42: Merge "Avoid caching shadow properties in Java & HWUI."
* commit 'a5e12a4227d6ef1efd4f17697f407d165a992a72':
  Avoid caching shadow properties in Java & HWUI.
2014-05-08 14:47:34 +00:00
Baligh Uddin
22c782267e am af0c9964: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'af0c9964ee5e74d3ef0c086b6174d326941bb247':
  Import translations. DO NOT MERGE
2014-05-08 14:43:29 +00:00
Baligh Uddin
8ac1ea8bad am 37e6e316: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '37e6e3164e0510633765f0fbb76dc6d2760411bd':
  Import translations. DO NOT MERGE
2014-05-08 14:43:26 +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
448b52ec3b am 155f9087: Merge "Improved animation logic of the new notifications"
* commit '155f908763480fe60363f5f4f6bf85e60f31a6ce':
  Improved animation logic of the new notifications
2014-05-08 13:38:40 +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
8e812b74cb am 96428eed: Merge "Fix crash in ActivatableNotificationView."
* commit '96428eed59d74368f2c47f12bdd2a8729888a545':
  Fix crash in ActivatableNotificationView.
2014-05-08 13:09:30 +00: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
71f42d6a7a am 61b99613: Merge "Limit package launcher apps callback to enabled users."
* commit '61b996134da3c5b04a6f442ad6e1d80dd7f8a5ac':
  Limit package launcher apps callback to enabled users.
2014-05-08 12:58:05 +00:00
Kenny Guy
26ecbefea0 Merge "Limit package launcher apps callback to enabled users." 2014-05-08 12:54:39 +00:00
Sander Alewijnse
12fa1fe307 am 7d5cd652: Merge "Add API to disable account management for certain types of accounts."
* commit '7d5cd65262c9a5735f660e05ce89a02f2d28be14':
  Add API to disable account management for certain types of accounts.
2014-05-08 12:52:50 +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
219ccc3b35 am 776e9894: Merge "Send boot_completed for users started in the background"
* commit '776e98945f482e1e1be4e04d3e835c691142032f':
  Send boot_completed for users started in the background
2014-05-08 12:25:20 +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
fea08f22de am 20d80a4a: Merge "Quantum notification improvements."
* commit '20d80a4a05249fca9f4aa6c80b61a1f7a9e18dd0':
  Quantum notification improvements.
2014-05-08 11:34:31 +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
34a6418cba am a05be305: Merge "Unhide further 1.7-era APIs"
* commit 'a05be305825501bdfc7fe812d675cc86d1cae221':
  Unhide further 1.7-era APIs
2014-05-08 10:32:32 +00:00
Neil Fuller
37a61c5e84 Merge "Unhide further 1.7-era APIs" 2014-05-08 10:28:25 +00:00
Christoph Studer
ec9dad8ccd am 5fe09365: Merge "Record notification events to a local SQLite DB"
* commit '5fe09365d8a6669e688ae3c705e4abb9d6d9e0db':
  Record notification events to a local SQLite DB
2014-05-08 10:25:41 +00:00
Christoph Studer
5dfbe24fc4 Merge "Record notification events to a local SQLite DB" 2014-05-08 10:21:14 +00:00
Vinit Deshapnde
558322e093 am 26e8778f: Merge "Remove reference to WifiScanner till the API is made public"
* commit '26e8778f58a8ccf8c73ae16cd30e05515438496e':
  Remove reference to WifiScanner till the API is made public
2014-05-08 10:10:00 +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
71094f0aee am 28866e1d: Merge "Disallow the INTERACT_ACROSS_USERS permission for system apps"
* commit '28866e1d82626075829de5740481d445a836bcd2':
  Disallow the INTERACT_ACROSS_USERS permission for system apps
2014-05-08 09:44:21 +00: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
6f5494c749 am c5fe3c17: Merge "Initial implementation of WifiScanner"
* commit 'c5fe3c179c9f82cacaf0ac082f49de9f9c31708c':
  Initial implementation of WifiScanner
2014-05-08 08:45:04 +00:00
Vinit Deshapnde
b788d4eb01 Merge "Initial implementation of WifiScanner" 2014-05-08 08:22:59 +00:00
Dan Sandler
327f0add84 am cea92759: Merge "L: WIP."
* commit 'cea92759f0c6e174b57883f9586f2868f2c9a7f3':
  L: WIP.
2014-05-08 06:49:30 +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
ce311f62ca am 16170143: Merge "initial Best Network Selection implementation"
* commit '16170143a30e9e45f3fbdd8f27037fcbd8f403e8':
  initial Best Network Selection implementation
2014-05-08 03:08:01 +00:00
vandwalle
c4bfcc12e9 Merge "initial Best Network Selection implementation" 2014-05-08 03:03:02 +00:00
Craig Mautner
c26c329d2e am 8f48624b: Merge "Account for windows on non-app display."
* commit '8f48624bdc8af5add52c9184b42ed10583f63710':
  Account for windows on non-app display.
2014-05-08 02:27:43 +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
073af7f370 am 5bce77b1: Merge changes Idc1e6e52,If1729a01
* commit '5bce77b17aae18aff7a2f538051956a48fa66888':
  Allow different animation lengths in StackStateAnimator.
  Only handle scroll events when over content.
2014-05-08 01:28:40 +00: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
Jorim Jaggi
f78a667d54 am 0d78fb70: Merge "Enable "More"-card double tap interaction."
* commit '0d78fb70c554d1d531844e4f39bb3b7fc2ed4caa':
  Enable "More"-card double tap interaction.
2014-05-08 01:18:29 +00:00
Jorim Jaggi
18ca6f3cc3 am 7a11b237: Merge "Introduce AmbientState for StackScroller."
* commit '7a11b237632fa2822678901659ea3a50246d2ced':
  Introduce AmbientState for StackScroller.
2014-05-08 01:18:26 +00:00