Commit Graph

30465 Commits

Author SHA1 Message Date
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
ff4ba8ae6f Merge "Delete "Show CPU usage"" into nyc-mr1-dev am: 09d3961326
am: 2c89007df6

Change-Id: Iaddfa85f013b44648b12fed164e26d02251471fc
2016-10-11 18:28:05 +00:00
Nick Kralevich
a5a5ebfe5d Delete "Show CPU usage" am: 73dfef91b2
am: 0f3067ce58

Change-Id: Ic7a08dfa404e8dc35feb17187fe7067ee868c715
2016-10-11 18:14:34 +00: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
d754fdb4eb Import translations. DO NOT MERGE am: 64d3e22e11 -s ours am: 9f8644c04f -s ours
am: d13a041835  -s ours

Change-Id: Ibcfcbaa91d51944f0861d0f65e50461004db8779
2016-10-11 15:14:56 +00:00
Bill Yi
2e8fd872d2 Import translations. DO NOT MERGE am: 6acf691f62 -s ours
am: 557f83edb5  -s ours

Change-Id: I4d4f4c323c27dced0088b588567c7b42f3acb3e1
2016-10-11 15:14:42 +00: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
05a98e79f5 Fixed spans getting stripped from disclaimer am: e0b74a6de0
am: e3c31f3aec

Change-Id: Ia05205f27bdaccd7f08e311ef0c24a0af1776f64
2016-10-07 21:08:47 +00: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
d4abdb67d3 Merge "The center column of the support tab is back to white" into nyc-mr1-dev am: 9f95a59b88
am: d983045488

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

Change-Id: I6af46ec8fdba17edbb2716704e903c7aedb7d456
2016-10-06 22:53:33 +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
Salvador Martinez
0967f79ce0 Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am: 8a468ccbdf
am: 17866f0b17

Change-Id: Icc7ae5e2d553a2ef9ad8d568b0e2d90a393256b1
2016-10-06 22:46:46 +00:00
Salvador Martinez
6a832d4db6 Added onClick logic for domain url list screen am: 26e5760033
am: 1d383e1220

Change-Id: Ib1e58b680a866dea0b4ac398215d94f6c636f1cc
2016-10-06 22:46:32 +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
1e7f5e9dd7 Import translations. DO NOT MERGE am: a6b32526d7 -s ours
am: f6a7a97ab5  -s ours

Change-Id: I51cf96a100e1a84bbc8fbd6dc5ce26b66056ec12
2016-10-06 21:55:00 +00:00
Fan Zhang
6b72c17434 Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc
am: 207bb2947e

Change-Id: Ied103f6707f804a8b386d0f0d3df1837c5b98571
2016-10-06 21:54:46 +00:00
Fan Zhang
ac053b6179 Fix a NPE in confirm lock screen. am: 8b2baed2be
am: da856402f4

Change-Id: Ia13e941b8766ae128bf31f224656f7e862e0b059
2016-10-06 21:54:30 +00:00
Jeff Sharkey
049d2b88f6 Switch to static warning threshold when adopting. am: bd7adb9313
am: da414d0afe

Change-Id: I111c8b3ea63deb6e9797a520f1431d73adc16c99
2016-10-06 21:54:16 +00:00
Jonathan Nieder
27615e6b49 Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am: 6cab381bc2
am: 64136f30d1

Change-Id: I3ee238ba4cc3ec5abc1ecc950dc01e7b08a5d62a
2016-10-06 21:52:45 +00:00
Doris Ling
a5eb66eb01 Add condition check for double tap gesture settings. am: c8b7555fc9
am: 7f62890cad

Change-Id: If89dfb781ca8b8e0a7dd8e0b1f59e32ae6d4d98f
2016-10-06 21:52:33 +00:00
Matthew Fritze
dabb84876b Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381
am: 62fcf9369f

Change-Id: I7aa60f53cf44d5090a648551ef2ff02431981ff0
2016-10-06 21:52:02 +00:00
Matthew Fritze
5b509e12ff Fix bug preventing users from clicking settings suggestions twice am: f265dbc447
am: e5e60eccaf

Change-Id: I956ed80ce27ec50378901111f5679b163719628f
2016-10-06 21:51:47 +00:00
Jeff Sharkey
2eda02e617 Give CTS the handle it expects to remove PIN. am: 7be1b5923f
am: 4ae8eb2aae

Change-Id: Ic3ee8be685d83b8be07f2e0129e3a7573ad4e920
2016-10-06 21:15:12 +00:00
Bill Yi
4b9f135da5 Import translations. DO NOT MERGE am: 972c78b4ee -s ours am: e87f2bbaa0 -s ours
am: 784b1cbf35  -s ours

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

Change-Id: Idd81a0beb1b5999696e6f47ab6fb64110a4f0793
2016-10-06 21:10:06 +00:00
jackqdyulei
15c14f0cc2 Add "FILTER_NOT_HIDE" for all app filters. am: d785a8db78
am: 00ed827516

Change-Id: I108753ea9af54aba754a8899f02a3f100f3b38fd
2016-10-06 21:00:31 +00:00
Bill Yi
4d6ff7e669 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9 -s ours
am: f0be222981  -s ours

Change-Id: I22381a4a7bc572765718c6003769431b0974567c
2016-10-06 21:00:03 +00:00
Bill Yi
b30d988a1c Import translations. DO NOT MERGE am: 8aee525418 -s ours
am: 47f6271d15  -s ours

Change-Id: I9f2c7f8ffce896e53ca32192b6902760b9939bb2
2016-10-06 20:59:44 +00:00
Lorenzo Colitti
03cbc81f32 Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
am: bb529c267d

Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331
2016-10-06 20:59:31 +00:00
Lorenzo Colitti
54ec71200b resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
am: be3924c1b6

Change-Id: Ifecf71ed6b0c756fb59ce8fa4293aebb68158f89
2016-10-06 20:59:17 +00:00
Matthew Fritze
927007dd53 Prevent monkey tests from crashing with race conditions am: 7ac78f2daf
am: 9264154bee

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

Change-Id: Iff1708277ff2827a631228d4c4a286e503543190
2016-10-06 20:58:50 +00:00
Bill Yi
5fb2b6c1c5 Import translations. DO NOT MERGE am: ae33f8e62c -s ours
am: b1f3f659f1  -s ours

Change-Id: Ibb7e5a0d26b14095d632979a5e57fd8bed9966f1
2016-10-06 20:58:37 +00:00
Philip P. Moltmann
96d81b1332 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
am: ae23c07073

Change-Id: I9ccd46e5d5d15685dccf8b9a3dbd5a82b56d6bda
2016-10-06 20:58:22 +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