Commit Graph

246497 Commits

Author SHA1 Message Date
Julia Reynolds
5774cf08de Reset slider animator on density change
Change-Id: Iae7d32746c6ea2cabe7d0d58ff11a05d1722fce4
Fixes: 28626591
2016-05-26 13:43:38 -04:00
Phil Burk
2050f6cb43 AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Explain buffer size optimization.

This CL has no code changes, just documentation changes.

Bug: 28802853
Change-Id: I91942f00a3e9691e4fc05b24656b8bf4cb538bc2
Signed-off-by: Phil Burk <philburk@google.com>
2016-05-26 10:34:50 -07:00
smain@google.com
8f60544180 add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: Ied13eedb15940b4a52562beffc9ea7652a0c4c76
2016-05-26 10:33:07 -07:00
Doris Ling
ce8e88aaab Merge "Added new action for gesture settings." into nyc-mr1-dev 2016-05-26 17:20:54 +00:00
Manoja Wijewardene
1ad12e0678 Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev 2016-05-26 17:20:49 +00:00
TreeHugger Robot
9aed8c2fa0 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 17:07:55 +00:00
TreeHugger Robot
62d1f54d04 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-26 17:07:24 +00:00
George Mount
f43ea5d4d2 Fix Activity Transition mess-up.
Bug 28610520

isTopOfTask() was returns false in onResume always because
it wasn't being made visible until after onResume. The visibility
of the window is not important for this method (older versions
didn't check it at all), so that was removed.

Change-Id: I45e506e72356cc3808e2e9340739726c99da7d97
2016-05-26 10:06:35 -07:00
TreeHugger Robot
cb8c569414 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 16:56:13 +00:00
TreeHugger Robot
06b1de25af Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-26 16:55:58 +00:00
Julia Reynolds
2bf73e94c3 Merge "Importance slider updates." into nyc-dev 2016-05-26 16:50:58 +00:00
TreeHugger Robot
36cbf5ca37 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 2016-05-26 16:49:51 +00:00
Dan Sandler
1b1edde9ee Time to #NameAndroidN!
Bug: 27376882
Change-Id: I32397e634039a64b86669662908fab2effb367a7
2016-05-26 12:47:25 -04:00
Jason Monk
72f19ff6f0 Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev 2016-05-26 16:46:48 +00:00
Robin Lee
33154deb70 Merge "Check if we're connected before marking a UID blocked" into nyc-dev 2016-05-26 16:42:17 +00:00
Michael Wright
c38a203376 Revert "Revert "Finalize resource IDs for N.""
This reverts commit a5c9ca4f07418b80ac99a3d23df012d77faa2bc4.

Bug: 28810934
Change-Id: I31816ab5470b84f85c8416312b5ac39884b8cc9a
2016-05-26 17:38:11 +01:00
Michael Wright
9ed5eefc28 Revert "Finalize resource IDs for N."
This reverts commit 7c8e76f87d.

Bug: 28810934
Change-Id: I3a61bb0c2364909480045dd40adba6445d6afabd
2016-05-26 17:38:06 +01:00
TreeHugger Robot
0f97b8fcbd Merge "add metrics for notification and group expansion" into nyc-dev 2016-05-26 16:35:29 +00:00
Michael Wright
7c8e76f87d Finalize resource IDs for N.
Bug: 28810934
Change-Id: If68bfb46cc5fa2d5ea0ee613689198e1ea42dce7
2016-05-26 17:35:28 +01:00
TreeHugger Robot
8e5d7413b8 Merge "boost starred people to at least high importance" into nyc-dev 2016-05-26 16:35:21 +00:00
Ji Yang
f8969b233c Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
2016-05-26 15:54:27 +00:00
Jonathan Basseri
4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 2016-05-26 15:50:05 +00:00
Jeff Sharkey
4a39936d36 Suppress unlock notifications on non-FBE devices.
We have a longer-term plan to clean up FBE unlock notifications, but
in the meantime don't confuse users by quickly flashing them on
non-FBE devices.

Bug: 28840764
Change-Id: I696508ef981b6f8f51f22ea24487d87d27d5b6e3
2016-05-26 09:47:45 -06:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
Jeff Sharkey
4815ed4500 Cache IMountService for isUserKeyUnlocked() calls.
This avoids doing a ServiceManager lookup for every call through
this hot code-path.

Bug: 28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
2016-05-26 09:31:06 -06:00
Robin Lee
ebbcb54a43 Check if we're connected before marking a UID blocked
This kills the always-on test, and any third-party app that correctly
checks whether it's blocked before attempting to make a connection.

Only affects always-on VPN when lockdown=true.

Bug: 28909500
Change-Id: I87aa9598d3872ae2ec409c2b19d73052c21ec878
2016-05-26 15:29:46 +00:00
Paul Jensen
94c8855da6 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3
am: 7ff57eaff9

* commit '7ff57eaff95fd4cdb3cc80f8e420b469f0656bb8':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I80187f003e437678786f0740f23e76543890b9bc
2016-05-26 15:22:55 +00:00
Paul Jensen
7ff57eaff9 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb
am: a5a2c88fb3

* commit 'a5a2c88fb3ac43315575de94696c837cb6b88c35':
  Don't pass URL path and username/password to PAC scripts

Change-Id: Ia33d40ae5d4b6ee0cd3cfcdc8587d6002603f128
2016-05-26 15:13:07 +00:00
Julia Reynolds
3aa969f68d Importance slider updates.
Icon & tint.

Bug: 28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
2016-05-26 11:07:49 -04:00
Paul Jensen
a5a2c88fb3 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938
am: 54a62d5feb

* commit '54a62d5febc8771f65221db3dd5c6e08f3288eb8':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I1da24c02fbf85a7f0fd3ea7a86ad3a34389000e8
2016-05-26 15:02:46 +00:00
Jason Monk
49a2796cdd QS: Make hotspot go unavailable in airplane mode
Put the hotspot tile in the unavailable state whenever airplane
mode is on.

Change-Id: I7a6eb54c2e89a7a9736c72d8e58ab58e7e82d0a6
Fixes: 28881032
2016-05-26 10:57:59 -04:00
Paul Jensen
54a62d5feb Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02
am: 7c625e1938

* commit '7c625e1938f28cf2a455fb1f4ab71dca99341b3d':
  Don't pass URL path and username/password to PAC scripts

Change-Id: If2e068e47e6efd4b8ad7abc7fb358860b188a380
2016-05-26 14:50:37 +00:00
Michael Wright
28984d4d80 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
2016-05-26 14:38:56 +00:00
Paul Jensen
7c625e1938 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364
am: 75095e6f02

* commit '75095e6f02b13d070bb74b019ab6392f0f7b1105':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I0da4c878a1bd78837abc40a3ab332c6a1e781d3e
2016-05-26 14:35:08 +00:00
Paul Jensen
75095e6f02 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434
am: 42a5983364

* commit '42a59833648243a8ac3aec7adf7f4ca0d3babdd1':
  Don't pass URL path and username/password to PAC scripts

Change-Id: Id92ff5deed707c029fc6d5806aff2a324961c2ec
2016-05-26 14:13:16 +00:00
Ricky Wai
9b22e5b4e8 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am: 1cb6f9d8a4

* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
  Add resetKeyStore() in LockSettingsService

Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae
2016-05-26 14:03:51 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
Ricky Wai
56181175a7 Merge "Store work lock type even it uses unified lock" into nyc-dev
am: 610fb8a3f2

* commit '610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b':
  Store work lock type even it uses unified lock

Change-Id: I89e322d1f21964074a3deec2fcc9a507c496d36e
2016-05-26 14:02:06 +00:00
Paul Jensen
42a5983364 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141
am: 6c35cf2434

* commit '6c35cf2434ca373196b16620455f8f234b63d594':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I9bbca312129011822fc5ea95682bac5ca4258ced
2016-05-26 14:01:19 +00:00
Ricky Wai
1cb6f9d8a4 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 2016-05-26 13:46:26 +00:00
Ricky Wai
610fb8a3f2 Merge "Store work lock type even it uses unified lock" into nyc-dev 2016-05-26 13:46:12 +00:00
Paul Jensen
6c35cf2434 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff
am: bb27626141

* commit 'bb2762614181a0ee03554a96c070ea1006d7263c':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594
2016-05-26 13:44:37 +00:00
Paul Jensen
bb27626141 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff
am: 8940d2b0ff

* commit '8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e
2016-05-26 13:37:24 +00:00
Paul Jensen
8940d2b0ff Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
am: af0b4466ff

* commit 'af0b4466ffe2ed09b288014d1d3a9ed308fe3c76':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e
2016-05-26 13:30:59 +00:00
Paul Jensen
af0b4466ff Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev 2016-05-26 13:18:05 +00:00
Christopher Tate
0905c8f398 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057
am: 040cf14047

* commit '040cf14047fb025f603c73e56a9bfd06c84a2483':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I3f6a42a6a1c3492439a8a7a93537de52a6f1cf1f
2016-05-26 12:52:19 +00:00
Christopher Tate
040cf14047 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886
am: 1fa817c057

* commit '1fa817c057c909d1ba4f5a356f6eb4b52a3bc628':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Ia409bff3b5db1ba686d884f81e45b242ec1ae38f
2016-05-26 12:31:55 +00:00
Nicolas Prevot
eb6ce93432 Merge "Use correct user id when checking uri grants for notification." into nyc-dev
am: 19d34821b9

* commit '19d34821b9c0a74d4269fff0bee87a7f486e1603':
  Use correct user id when checking uri grants for notification.

Change-Id: Ic5a0e511f7f844e38fba10adb87a059f83673201
2016-05-26 11:06:30 +00:00
Nicolas Prévot
19d34821b9 Merge "Use correct user id when checking uri grants for notification." into nyc-dev 2016-05-26 10:37:32 +00:00
Yi Kong
8ea65f2264 Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
am: 03a1314f2e

* commit '03a1314f2e9040d48488c7cf38dba273ba669284':
  Docs: Update content license page to include Javadocs licenses

Change-Id: I350ceeb794b065cbc735cda75fff010ee31fd9f4
2016-05-26 09:09:02 +00:00