Commit Graph

277484 Commits

Author SHA1 Message Date
TreeHugger Robot
31bc1f5ecf Merge "QS: Don't show graph or warning text when not present" into nyc-mr1-dev 2016-09-23 19:52:40 +00:00
William Harmon
429048ddce Merge "Remove location tile from the list of default-enabled QuickSettings tiles" into nyc-mr1-dev
am: 8add486673

Change-Id: I78d36bcb50d76a34ee27372ff04ced139cc3db12
2016-09-23 19:49:47 +00:00
Will Harmon
a6f4c5cb1b Remove location tile from the list of default-enabled QuickSettings tiles
am: 3629af022f

Change-Id: I41b1dec13ccf3e43be0b8faf9414287e48cef27b
2016-09-23 19:49:45 +00:00
Alan Viverette
1d1e0e2469 Merge "Allow developer to override Material-style modes in picker dialogs" into nyc-mr1-dev am: 2525b0dab3
am: 4741c705aa

Change-Id: I31ebd2ea88a85f45909ccc32c3a2a15dc49faf38
2016-09-23 19:47:10 +00:00
Alan Viverette
6e37f8a077 Allow developer to override Material-style modes in picker dialogs am: 8817aa9339
am: 010ab618af

Change-Id: I0d68842adb7097f4d32977f31d80a10bc166c045
2016-09-23 19:43:39 +00:00
William Harmon
8add486673 Merge "Remove location tile from the list of default-enabled QuickSettings tiles" into nyc-mr1-dev 2016-09-23 19:40:54 +00:00
Alan Viverette
4741c705aa Merge "Allow developer to override Material-style modes in picker dialogs" into nyc-mr1-dev
am: 2525b0dab3

Change-Id: I055de8ae1d9a0e49d589dfa0af78dc2e5afe5daa
2016-09-23 19:39:56 +00:00
Alan Viverette
010ab618af Allow developer to override Material-style modes in picker dialogs
am: 8817aa9339

Change-Id: I4733798d4785459ea36a75cddfeb7358912fe9d6
2016-09-23 19:36:42 +00:00
Jason Monk
2e18eff746 Revert "Change bang to x for indication of no internet" am: ed29365c9e
am: 287ea2f714

Change-Id: I400ec6a4181ff2b88e187dbe51d915443327e825
2016-09-23 19:31:46 +00:00
Alan Viverette
2525b0dab3 Merge "Allow developer to override Material-style modes in picker dialogs" into nyc-mr1-dev 2016-09-23 19:29:54 +00:00
Jason Monk
287ea2f714 Revert "Change bang to x for indication of no internet"
am: ed29365c9e

Change-Id: I7dc0b10fe93e80adf8a3f2cf386268957a0323de
2016-09-23 19:28:17 +00:00
Tucker Sylvestro
b32aae2a46 Add the onDeviceOffBody API method to KeyStore
This is necessary for allowing the KeyStore to lock keys that remain
authorized as long as the device is on-body.

Bug 28911985

Change-Id: If50bc84d5a1cb23f9b01b1950c3676d1519cc4f5
2016-09-23 15:11:42 -04:00
Will Harmon
3629af022f Remove location tile from the list of default-enabled QuickSettings tiles
Fixes: 31708103
Change-Id: I0218beee23199df2e6969e3e858294e65db6c0f8
2016-09-23 19:11:12 +00:00
Meng Wang
2c25e4a96b Support WFC roaming preference
Added keys in CarrierConfig and Settings.Global

Bug: 31492826
Change-Id: Ice33f6ee5c42b92ed2f7258ff8b28c50510cde31
2016-09-23 12:09:02 -07:00
Vadim Tryshev
c5109b3f6e Update/correct Drag and Drop docs.
This CL reflects the N MR1 behavior and
fixes some bugs.

Defining the compatibility behavior will be
done separately.

Bug: 31702571
Change-Id: I2a79871f47849f9f5a9c3377a3061208488e6ecb
2016-09-23 11:47:09 -07:00
Mark Renouf
b46c93e33b Extract action icons for Wear adjusted for optical alignment
Correct ImageButton padding to spec for both round and square
Wear specific versions of icons are shifted for visual alignment

BUG: 31558107
Change-Id: Iebcefb7b7b200701904b9bb378c514e0efd0961a
2016-09-23 14:30:00 -04:00
Jason Monk
a03c641c60 QS: Don't show graph or warning text when not present
Change-Id: Ic2cfcc0716a70a3d577d17e5af9c5d1f7f8fd4c6
Fixes: 30694497
Fixes: 30898011
2016-09-23 14:18:19 -04:00
Jason Monk
ed29365c9e Revert "Change bang to x for indication of no internet"
This reverts commit d67fbe6201.
Fixes: 31271895

Change-Id: Ief00046dde1309fb66e3284b1c57264882297ad9
2016-09-23 17:55:34 +00:00
Miao Wang
a43ff9cb73 Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-mr1-dev am: 6b5d4723d2
am: a1050aff1d

Change-Id: If5920dbec72769ff840e622769e24a23d11d1ee6
2016-09-23 17:40:54 +00:00
Shuo Gao
82e0dbf404 Enable shader cache for applications that shared UID with multiple packages too am: 1e6d77e836
am: 304c720d4a

Change-Id: Ia5975a576b74afdb3753e5ca9c07bb9d8408c8c1
2016-09-23 17:39:45 +00:00
Miao Wang
a1050aff1d Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-mr1-dev
am: 6b5d4723d2

Change-Id: Ibbae908c61926aa2d9e7387cfb4752ad202aeee5
2016-09-23 17:36:11 +00:00
Shuo Gao
304c720d4a Enable shader cache for applications that shared UID with multiple packages too
am: 1e6d77e836

Change-Id: I1d90470f85a632417845e961ef75b8c5a2703b50
2016-09-23 17:36:09 +00:00
Adam Powell
2366ff12a2 ResolverComparator transitivity
Fix a bug where ResolverComparator's results were not consistent for
targets that cross profile boundaries.

Bug: 31640894
Change-Id: Ic6bf9512d2c2eb6f8fb7851e18eb9a347db29755
2016-09-23 10:36:01 -07:00
Miao Wang
6b5d4723d2 Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-mr1-dev 2016-09-23 17:28:54 +00:00
Etan Cohen
ede1d0f211 [NAN] Add Handler to publish/subscribe per API review
All callback registrations must have handlers.

(cherry-pick of commit 9b04fd2475)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I5ecc04f997e45b76710f526f378e4cf6e0e28fb9
2016-09-23 10:16:26 -07:00
Salvador Martinez
5d937fc95f Updated summary logic for wifi
Wifi summary claimed it would not
reconnect under conditions where it should.
This has been changed to properly say when an
AP will automatically be reconnected to.

Test: make RunSettingsLibRoboTests
Bug: 29973023
Change-Id: I2ffb4ec3b83e93c3df9ee179fc6a6bf59acec42e
2016-09-23 08:54:20 -07:00
Makoto Onuki
1789235992 Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev am: 18fb24c5d3
am: 8f9146ef48

Change-Id: Ibab2dbf14eb8aaa5426ec4ae66e1b0900428cecf
2016-09-23 15:47:25 +00:00
Makoto Onuki
4001a2b4c4 Fix DPM unit tests, also fix a log message. am: 6ad5f92512
am: 2f78ab5387

Change-Id: Id42c0cda2542eb5cc2325d8c6747e8bbe7d3a1ef
2016-09-23 15:46:37 +00:00
Makoto Onuki
8f9146ef48 Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev
am: 18fb24c5d3

Change-Id: Ic61398ebf0f4b453c2e859f49b373810934218bd
2016-09-23 15:43:06 +00:00
Makoto Onuki
2f78ab5387 Fix DPM unit tests, also fix a log message.
am: 6ad5f92512

Change-Id: Ieab914cf8538e3086fb32cc351e45e6a5c2017c5
2016-09-23 15:43:04 +00:00
Makoto Onuki
18fb24c5d3 Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev 2016-09-23 15:34:40 +00:00
Gopal Krishna Shukla
260af96306 Merge "Provide synchronization to setview to avoid NPE" am: b05b93a674 am: 810c31fdca
am: 621e87d72f

Change-Id: Ib5b7470db042d60593d2e545c901240a456dcada
2016-09-23 13:14:51 +00:00
Gopal Krishna Shukla
621e87d72f Merge "Provide synchronization to setview to avoid NPE" am: b05b93a674
am: 810c31fdca

Change-Id: Ibd664e4836eaceef8a4d8363793667afa757387a
2016-09-23 13:11:23 +00:00
Gopal Krishna Shukla
810c31fdca Merge "Provide synchronization to setview to avoid NPE"
am: b05b93a674

Change-Id: I92bec8af349cae5232e65d88938635a93f06fc6a
2016-09-23 13:07:52 +00:00
Treehugger Robot
b05b93a674 Merge "Provide synchronization to setview to avoid NPE" 2016-09-23 12:57:58 +00:00
Ivan Podogov
b1f9008e4e Merge "Add property to disable camera service proxy." into cw-f-dev
am: fa10c2869b

Change-Id: Ie489e5d7b27087a8284319997404c7c8cc8fa98f
2016-09-23 11:13:44 +00:00
Ivan Podogov
b8fdf0aa16 Add property to disable camera service proxy.
am: 8adaec07f0

Change-Id: I9477a39ae23c346437f9eb37bd0bbeaf946dbbd4
2016-09-23 11:10:22 +00:00
Ivan Podogov
fa10c2869b Merge "Add property to disable camera service proxy." into cw-f-dev 2016-09-23 11:04:09 +00:00
Michal Karpinski
b641c0c7b7 Merge "Fingerprint Strong auth timeout" into nyc-mr1-dev am: 69659cb96d
am: c1b1be6bd9

Change-Id: I06067f2443a4dd8bd195d85e8ca4e3cd5c827f70
2016-09-23 07:14:27 +00:00
Michal Karpinski
6f81529e28 Fingerprint Strong auth timeout am: 0b72a722ed
am: 369672b8bb

Change-Id: Id152e63ba4b378ea10787198c3f6cd58d2f07495
2016-09-23 07:13:34 +00:00
Michal Karpinski
c1b1be6bd9 Merge "Fingerprint Strong auth timeout" into nyc-mr1-dev
am: 69659cb96d

Change-Id: Ia4053b06fe434a61b11037ee250c2edc9689b06b
2016-09-23 07:10:06 +00:00
Michal Karpinski
369672b8bb Fingerprint Strong auth timeout
am: 0b72a722ed

Change-Id: I70a4c0288aa2d98c02706a055a5dda710ace2ae2
2016-09-23 07:09:59 +00:00
Michal Karpinski
69659cb96d Merge "Fingerprint Strong auth timeout" into nyc-mr1-dev 2016-09-23 07:01:51 +00:00
Hugo Benichi
517fcf9d11 Merge "IpConnectivityLog uses new metrics service" into nyc-mr1-dev am: 417748f064
am: 9b68360135

Change-Id: Ib9e1bc6873ad1fb045b57eb54c4a164148d68f14
2016-09-23 06:03:59 +00:00
Hugo Benichi
e69608f864 resolve merge conflicts of 00f07be to nyc-mr1-dev-plus-aosp
Change-Id: I82865b2847c584f8a1d728ef76113e3969f222ca
2016-09-23 14:48:01 +09:00
Hugo Benichi
9b68360135 Merge "IpConnectivityLog uses new metrics service" into nyc-mr1-dev
am: 417748f064

Change-Id: I7fae7760d5ec872a0a989ca3964419d3839694ad
2016-09-23 04:48:51 +00:00
Hugo Benichi
00f07beff9 IpConnectivityLog uses new metrics service
am: 00a42d4c88

Change-Id: I1e3b611eeec448e333e83cb8d630f0e9906b7f14
2016-09-23 04:48:49 +00:00
Hugo Benichi
417748f064 Merge "IpConnectivityLog uses new metrics service" into nyc-mr1-dev 2016-09-23 04:43:23 +00:00
Etan Cohen
4c83ebbc4d Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97 am: a29bcecad9
am: 0517a6dcc7

Change-Id: I2c19aade571d63aabcea5962a1e4956c164c99f6
2016-09-23 04:22:17 +00:00
Etan Cohen
0517a6dcc7 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97
am: a29bcecad9

Change-Id: I622b78805d08a4e9c59e207598ebc5f3cbf8d135
2016-09-23 04:16:50 +00:00