Commit Graph

134063 Commits

Author SHA1 Message Date
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
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
Jorim Jaggi
5aa045cc6b Allow different animation lengths in StackStateAnimator.
Combine them using the maximum length.

Change-Id: Idc1e6e52f7f36ed46fbfba013c23773eeed95cd6
2014-05-08 01:18:00 +00:00
Jorim Jaggi
28bc6df693 Merge "Enable "More"-card double tap interaction." 2014-05-08 01:13:43 +00:00
Jorim Jaggi
8a2a5fa0d1 Merge "Introduce AmbientState for StackScroller." 2014-05-08 01:13:31 +00:00
Jason Monk
cb20502fb4 am a7cb6e54: Merge "Fix Docs breakage"
* commit 'a7cb6e5419c68bf950b1babbf7ba5c951ddf8086':
  Fix Docs breakage
2014-05-08 01:05:02 +00:00
Craig Mautner
749d065a9b am aa79c9d7: Merge "Use new doccentric flags and attributes in Sharing"
* commit 'aa79c9d7d4c4adc24f7f0ffa2c01c46241430b71':
  Use new doccentric flags and attributes in Sharing
2014-05-08 01:04:59 +00: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
Jorim Jaggi
fe6bfa644c 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
2014-05-08 02:46:10 +02:00
Jorim Jaggi
e96fcd1faa Enable "More"-card double tap interaction.
Bug: 14492098
Change-Id: I8b80df407df8b6df0af616932018e40e903a7966
2014-05-08 02:45:39 +02:00
Jorim Jaggi
d552d9d8e9 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
2014-05-08 02:33:56 +02:00
Russ Schnapp
d4a2c8ca7d am f975bc6a: Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras"
* commit 'f975bc6a682cc5b5a5c764a8cc9acedf0288ee43':
  Fix erroneous javadoc example SyncRequest.Builder.setExtras
2014-05-08 00:31:31 +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
Jason Sams
5066ac85d3 am 6eb4c5bf: Merge "Add flags to context creation for RS"
* commit '6eb4c5bf830c952d70473edff5f2b8e5ab98ce29':
  Add flags to context creation for RS
2014-05-08 00:05:04 +00:00
Jason Sams
8999bdc63c Merge "Add flags to context creation for RS" 2014-05-08 00:01:39 +00:00
Alan Viverette
e80e2fc71e am 91c091cf: Merge "State based animators for Views"
* commit '91c091cf7b732796d26971de6a508966e24d40a0':
  State based animators for Views
2014-05-08 00:01:07 +00: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
John Reck
bf4c565cda am c58ab5f6: Merge "Allow all loopers to be RT-accelerated"
* commit 'c58ab5f60e5fcc845ceb1e146372a1dbf99cbb82':
  Allow all loopers to be RT-accelerated
2014-05-07 23:45:12 +00:00
Jason Monk
40878bebf5 am 59e6e796: Merge "Fix Docs breakage"
* commit '59e6e796dae4e3e6436c7c714510155931183990':
  Fix Docs breakage
2014-05-07 23:45:08 +00:00
Vinod Krishnan
6c6fd8ad50 am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit 'f215073420706e29305da762fa5f9f53dcf330ff':
  Adding a HeartRate Feature
2014-05-07 23:44:59 +00:00