Commit Graph

35371 Commits

Author SHA1 Message Date
Phil Weaver
af26bae8b3 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9
am: 55b3b1f349

Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2
2017-07-18 20:59:48 +00:00
Phil Weaver
625d4bffc7 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69
am: 2e2e6fcc04

Change-Id: I2d9d6a7fb0ac1d88a4e910e9e23e7160bbfcdafd
2017-07-18 20:58:54 +00:00
Phil Weaver
2e2e6fcc04 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e
am: 85aa9ccc69

Change-Id: I8d411e2b84113763c49ec5c627f966da662a42b6
2017-07-18 20:57:24 +00:00
Phil Weaver
85aa9ccc69 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac
am: ba26fabe3e

Change-Id: I78f285821bc170c9a32b6e911e38826123c81820
2017-07-18 20:54:26 +00:00
Phil Weaver
55b3b1f349 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94
am: 46592e90a9

Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e
2017-07-18 20:54:21 +00:00
Phil Weaver
ba26fabe3e Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671
am: 91f4a42dac

Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5
2017-07-18 20:52:25 +00:00
Phil Weaver
91f4a42dac Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d
am: 57aa22c671

Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
2017-07-18 20:49:55 +00:00
Phil Weaver
57aa22c671 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780
am: 5d3967338d

Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c
2017-07-18 20:47:53 +00:00
Phil Weaver
46592e90a9 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d
am: 4c70016a94

Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a
2017-07-18 20:47:09 +00:00
Phil Weaver
5d3967338d Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9
am: f6b1267780

Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
2017-07-18 20:46:34 +00:00
Phil Weaver
4c70016a94 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3
am: 4b029f8b0d

Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6
2017-07-18 20:38:01 +00:00
Phil Weaver
f6b1267780 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours
am: 9d889600a9

Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f
2017-07-18 20:35:06 +00:00
Phil Weaver
4b029f8b0d Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b
am: c84dc8feb3

Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a
2017-07-18 20:28:31 +00:00
Phil Weaver
9d889600a9 Back-port ag/2491664 am: 1d21738bd6
am: 4150739791  -s ours

Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b
2017-07-18 20:25:56 +00:00
Phil Weaver
c84dc8feb3 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b

Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705
2017-07-18 18:36:26 +00:00
Phil Weaver
cbbdc18c7b Merge "Back-port ag/2491664" into lmp-dev
am: 41492a1e2c

Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd
2017-07-18 18:26:18 +00:00
Phil Weaver
4150739791 Back-port ag/2491664
am: 1d21738bd6

Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
2017-07-18 18:26:16 +00:00
Phil Weaver
41492a1e2c Merge "Back-port ag/2491664" into lmp-dev 2017-07-18 18:19:39 +00:00
Phil Weaver
b1685ab057 Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-18 09:23:14 -07:00
Phil Weaver
cc395469bc Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-17 16:38:07 -07:00
Phil Weaver
1d21738bd6 Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-13 00:03:49 +00:00
Phil Weaver
9e63322457 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a
am: 23a6d1d953  -s ours

Change-Id: Ic4747be59996146ac76509581e390afc99ebe876
2017-07-12 23:15:51 +00:00
Phil Weaver
23a6d1d953 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3
am: 8870bd7c5a

Change-Id: I4a9a2124db4e45793d969be6c3e33479524e01c9
2017-07-12 23:08:49 +00:00
Phil Weaver
8870bd7c5a DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6
am: 254bbe84a3

Change-Id: I87ffde2e35401e7d027ddae59bbbeddbe6ed91dc
2017-07-12 23:02:11 +00:00
Phil Weaver
254bbe84a3 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380
am: 8bf67896d6

Change-Id: If3df05ce2112fb26b53651f51d47987d4f8582ca
2017-07-12 22:56:17 +00:00
Phil Weaver
8bf67896d6 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours
am: e9d2bdc380

Change-Id: I568b19d74265138d2f5cb563491c379bcfbb18aa
2017-07-12 22:50:05 +00:00
Phil Weaver
e9d2bdc380 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c
am: 24aaf4d7ad  -s ours

Change-Id: Ibf0c76ba5e9059cd87282cefa9b0c7724ed64128
2017-07-12 22:41:40 +00:00
Phil Weaver
24aaf4d7ad DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688
am: a486c82d9c

Change-Id: Ib92175b78417bda6e58da2b93e37143a428852c0
2017-07-12 22:35:43 +00:00
Phil Weaver
a486c82d9c DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9
am: 4a40ef7688

Change-Id: I6d627519091040c4d64841210003de8aa1471f53
2017-07-12 22:29:09 +00:00
Phil Weaver
4a40ef7688 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours
am: bb12830bf9

Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f
2017-07-12 22:23:16 +00:00
Phil Weaver
bb12830bf9 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4
am: b72ffa47a4  -s ours

Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00
2017-07-12 22:19:08 +00:00
Phil Weaver
b72ffa47a4 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours
am: df045253a4

Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
2017-07-12 22:13:16 +00:00
Phil Weaver
df045253a4 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours
am: 98e0930394  -s ours

Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
2017-07-12 22:06:35 +00:00
Phil Weaver
98e0930394 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
am: bebc9f9f3c  -s ours

Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
2017-07-12 21:59:38 +00:00
Phil Weaver
bebc9f9f3c DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e

Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
2017-07-12 21:55:38 +00:00
Phil Weaver
840b78e19e DO NOT MERGE Back-port ag/2491664
am: 9a14484b38

Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
2017-07-12 21:43:49 +00:00
Phil Weaver
485d94a7ef Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-12 14:07:07 -07:00
Phil Weaver
9a14484b38 DO NOT MERGE Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
2017-07-12 20:50:13 +00:00
Bill Yi
750540ae48 Import translations. DO NOT MERGE
am: 7267438b58  -s ours

Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891
2017-07-11 03:47:35 +00:00
Bill Yi
7267438b58 Import translations. DO NOT MERGE
Change-Id: Ifbee1421f45d2cb6f3d5c533e5c4e9a2735afa10
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 17:16:10 -07:00
Bill Yi
f812f94216 Import translations. DO NOT MERGE
Change-Id: Ifb8d0e63a8150656a55bb1b2adf5748c75a10224
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:49:52 -07:00
Bill Yi
126ce95bc6 Import translations. DO NOT MERGE
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
2017-06-30 18:07:52 -07:00
Bill Yi
8e132ce53c Import translations. DO NOT MERGE
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
2017-06-27 00:26:26 -07:00
TreeHugger Robot
6b1ff7073a Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-23 12:23:16 +00:00
Bill Yi
8ec66e1f56 Import translations. DO NOT MERGE
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
2017-06-23 01:39:20 -07:00
Daniel Nishi
b22b85b593 Count cache in storage categories.
This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).

Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes: 62623731
Test: Settings Unit Test
2017-06-22 19:08:48 -07:00
Marie Janssen
1138397336 Bluetooth: Make notifications local-only
This will prevent them from showing up on external devices where they
would be less than useful.

Test: connect to watch and pair a device
Bug: 34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
(cherry picked from commit 426903d155)
2017-06-22 16:18:59 +00:00
Bill Yi
ae5a31e55c Import translations. DO NOT MERGE
Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import
2017-06-20 21:36:56 -07:00
TreeHugger Robot
05777a7918 Merge "Hide wifi and bt in battery settings" into oc-dev 2017-06-20 22:35:59 +00:00
jackqdyulei
d10608dfbb Hide wifi and bt in battery settings
Hide them in app usage list but don't smear them

Bug: 62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef
2017-06-20 13:44:52 -07:00