Commit Graph

27815 Commits

Author SHA1 Message Date
Daniel Sandler
93622202d3 Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
am: 0f6ae3aa87

Change-Id: I87fbb0cd4c462a7df76e2f5719aafc54ee671076
2016-10-12 13:51:05 +00:00
Dan Sandler
80df316ac4 Suppress notif block/silence settings for essential packages.
am: acf763e996

Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113
2016-10-12 13:51:04 +00:00
Daniel Sandler
0f6ae3aa87 Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev 2016-10-12 13:38:56 +00:00
Doris Ling
739a261295 Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
am: 49c0bab8bf

Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99
2016-10-12 00:23:48 +00:00
Doris Ling
79aa718669 Remove pickup gesture settings if sensor is not found.
am: 94e0da52fc

Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9
2016-10-12 00:23:46 +00:00
Doris Ling
49c0bab8bf Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev 2016-10-11 23:42:42 +00:00
Doris Ling
94e0da52fc Remove pickup gesture settings if sensor is not found.
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.

Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.

Bug: 32072298

Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
2016-10-11 14:23:59 -07:00
Nick Kralevich
2c89007df6 Merge "Delete "Show CPU usage"" into nyc-mr1-dev
am: 09d3961326

Change-Id: Iaa4e4d01ca8a1543994d9ca422991cc25a36d819
2016-10-11 18:14:06 +00:00
Nick Kralevich
0f3067ce58 Delete "Show CPU usage"
am: 73dfef91b2

Change-Id: I3bf3ab7c241980f21ae0b648db4e0e4065d3b848
2016-10-11 18:09:16 +00:00
Nick Kralevich
09d3961326 Merge "Delete "Show CPU usage"" into nyc-mr1-dev 2016-10-11 18:03:30 +00:00
Nick Kralevich
73dfef91b2 Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.

Bug: 21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
2016-10-11 09:03:29 -07:00
Bill Yi
d13a041835 Import translations. DO NOT MERGE am: 64d3e22e11 -s ours
am: 9f8644c04f  -s ours

Change-Id: I7dc4c1f300dd8a3afdd55cca1224c81e83528478
2016-10-11 15:09:26 +00:00
Bill Yi
557f83edb5 Import translations. DO NOT MERGE
am: 6acf691f62  -s ours

Change-Id: I2e8466a2baab0727b0a03ab96589cb0a1bd312a3
2016-10-11 15:09:11 +00:00
Bill Yi
9f8644c04f Import translations. DO NOT MERGE
am: 64d3e22e11  -s ours

Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948
2016-10-11 15:03:11 +00:00
Bill Yi
64d3e22e11 Import translations. DO NOT MERGE
Change-Id: I5616dbd321f70984c0386fd5b2e48f608ede25cb
Auto-generated-cl: translation import
2016-10-10 12:39:26 -07:00
Bill Yi
6acf691f62 Import translations. DO NOT MERGE
Change-Id: Ic1133c6ddf9e2230e189751a04c58b953ef2b4c5
Auto-generated-cl: translation import
2016-10-10 12:31:59 -07:00
Salvador Martinez
e3c31f3aec Fixed spans getting stripped from disclaimer
am: e0b74a6de0

Change-Id: I5b668306d5e6221f47903179b58ce9b227d6a940
2016-10-07 21:04:16 +00:00
Salvador Martinez
e0b74a6de0 Fixed spans getting stripped from disclaimer
In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.

Test: Instrumentation Test
Bug: 31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
2016-10-07 19:30:01 +00:00
Matthew Fritze
d983045488 Merge "The center column of the support tab is back to white" into nyc-mr1-dev
am: 9f95a59b88

Change-Id: Ic7948520f75b0b8024d9239a87734ae6fa003705
2016-10-06 22:49:58 +00:00
Matthew Fritze
409714d0e4 The center column of the support tab is back to white
am: 2d07290453

Change-Id: I14bb5ca55ed267b3144a091e5b0bc636aeaaaa1e
2016-10-06 22:49:56 +00:00
Matthew Fritze
9f95a59b88 Merge "The center column of the support tab is back to white" into nyc-mr1-dev 2016-10-06 22:43:28 +00:00
Salvador Martinez
17866f0b17 Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
am: 8a468ccbdf

Change-Id: Iffe25be2bb7623d3529feb8d0bd115c7b423db72
2016-10-06 22:42:57 +00:00
Salvador Martinez
1d383e1220 Added onClick logic for domain url list screen
am: 26e5760033

Change-Id: I11428c85ef077b7eee6ec7b6722463e86ac21a9b
2016-10-06 22:42:56 +00:00
Salvador Martinez
8a468ccbdf Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev 2016-10-06 22:37:05 +00:00
Bill Yi
f6a7a97ab5 Import translations. DO NOT MERGE
am: a6b32526d7  -s ours

Change-Id: I3235d07dafe77d05dadeadc3224469bd225ae7f8
2016-10-06 20:49:41 +00:00
Fan Zhang
207bb2947e Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
am: 6cea122bfc

Change-Id: Iba84fbd3eedd674fa038fa515dba507d2c4b9e0e
2016-10-06 20:49:12 +00:00
Fan Zhang
da856402f4 Fix a NPE in confirm lock screen.
am: 8b2baed2be

Change-Id: I4c16a428b3409b33815740c734b3390192866a20
2016-10-06 20:49:10 +00:00
Jeff Sharkey
da414d0afe Switch to static warning threshold when adopting.
am: bd7adb9313

Change-Id: Ib7e82d50f7d3e98d3a669a9508d6cee9871a4383
2016-10-06 20:48:56 +00:00
Jonathan Nieder
64136f30d1 Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev
am: 6cab381bc2

Change-Id: I4e140a32c84c820761176e816cbb88c4be46ef70
2016-10-06 20:48:23 +00:00
Doris Ling
7f62890cad Add condition check for double tap gesture settings.
am: c8b7555fc9

Change-Id: I7fa9e76725a7920d36936ffd4a737e8ed7eb8107
2016-10-06 20:47:32 +00:00
Matthew Fritze
62fcf9369f Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
am: fb42828381

Change-Id: I77f828913d3a941f040c6548fc99e86033e432a6
2016-10-06 20:47:09 +00:00
Matthew Fritze
e5e60eccaf Fix bug preventing users from clicking settings suggestions twice
am: f265dbc447

Change-Id: I0e9a1a92d84f2ae2dc783ddea4f6bcb728a72a52
2016-10-06 20:47:07 +00:00
Jeff Sharkey
4ae8eb2aae Give CTS the handle it expects to remove PIN.
am: 7be1b5923f

Change-Id: If949083726e0809d6ed45083282acda2255f546b
2016-10-06 20:41:48 +00:00
Bill Yi
784b1cbf35 Import translations. DO NOT MERGE am: 972c78b4ee -s ours
am: e87f2bbaa0  -s ours

Change-Id: Id32e92fba6ba6fbb791e0afd275cb59ae1dfe96e
2016-10-06 20:41:23 +00:00
Lei Yu
d7f2c10f94 Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
am: 9c54a67d66

Change-Id: Iba9f294bbbd1fd32e55950a6ddcc73604e4d0bea
2016-10-06 20:41:04 +00:00
jackqdyulei
00ed827516 Add "FILTER_NOT_HIDE" for all app filters.
am: d785a8db78

Change-Id: I779bc9de3e094c80c1749ac65acb932dc251f451
2016-10-06 20:28:52 +00:00
Bill Yi
f0be222981 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f91ca6bcd9  -s ours

Change-Id: Id18279ec5ccafbdcc0b4de8c24342f2c41ae9d10
2016-10-06 20:28:13 +00:00
Bill Yi
47f6271d15 Import translations. DO NOT MERGE
am: 8aee525418  -s ours

Change-Id: If58e31763e5f3b014126005d2816532323aa13f3
2016-10-06 20:28:12 +00:00
Lorenzo Colitti
bb529c267d Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
am: 365d95b69a

Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a
2016-10-06 20:27:51 +00:00
Lorenzo Colitti
be3924c1b6 resolve merge conflicts of f2801e4 to nyc-mr1-dev
am: b01c080b08

Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a
2016-10-06 20:27:49 +00:00
Matthew Fritze
9264154bee Prevent monkey tests from crashing with race conditions
am: 7ac78f2daf

Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a
2016-10-06 20:27:36 +00:00
Bill Yi
ffae7d82c3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 0d424ef9bd  -s ours

Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9
2016-10-06 20:27:09 +00:00
Bill Yi
b1f3f659f1 Import translations. DO NOT MERGE
am: ae33f8e62c  -s ours

Change-Id: Ibb93c7fcea5a052cbafc28b445bd85810a331122
2016-10-06 20:27:08 +00:00
Philip P. Moltmann
ae23c07073 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
am: f9ca06b367

Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9
2016-10-06 20:26:50 +00:00
Philip P. Moltmann
a78fced068 USB restriction is similar to media restriction
am: 13ee50be48

Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c
2016-10-06 19:55:42 +00:00
Bill Yi
a6b32526d7 Import translations. DO NOT MERGE
Change-Id: Id06ae993d6e5f0bb1249f5b94e96c73d1c1a183d
Auto-generated-cl: translation import
2016-10-05 17:36:53 -07:00
Salvador Martinez
26e5760033 Added onClick logic for domain url list screen
This class was created from a code refactoring
in ManageApplications but the functionality
associated with clicking on a preference was
accidently left out. This CL restores that
functionality.

Test: run ManageDomainUrlsEspressoTest class
Bug: 31958776
Change-Id: I1a7f5ee92daeebdb9fd7d9c83a564f0d104aa562
2016-10-05 14:46:34 -07:00
Matthew Fritze
2d07290453 The center column of the support tab is back to white
Regression came in here:
ag/1492761

Change-Id: I7ea5015abbe78d06b6df17d3caa3177642539023
Fixes:31958339
Test: Manual
2016-10-05 13:55:01 -07:00
TreeHugger Robot
6cea122bfc Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev 2016-10-05 19:52:03 +00:00
Jeff Sharkey
bd7adb9313 Switch to static warning threshold when adopting.
See rationale and details in inline comment block.

Test: adopt slow and fast SD cards
Bug: 29990216
Change-Id: I927d683db5e43216ee0837290ee4ca23a55a5dbb
2016-10-05 17:58:54 +00:00