OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoSuppress notif block/silence settings for essential packages. am: acf763e996
Dan Sandler [Wed, 12 Oct 2016 13:57:49 +0000 (13:57 +0000)]
Suppress notif block/silence settings for essential packages. am: acf763e996
am: 80df316ac4

Change-Id: I6c8b6133ab088362974df5c19d3b93d2862f8c92

7 years agoSuppress notif block/silence settings for essential packages.
Dan Sandler [Wed, 12 Oct 2016 13:51:04 +0000 (13:51 +0000)]
Suppress notif block/silence settings for essential packages.
am: acf763e996

Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113

7 years agoMerge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am...
Doris Ling [Wed, 12 Oct 2016 00:36:05 +0000 (00:36 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am: 49c0bab8bf
am: 739a261295

Change-Id: I25ceb867e68720f22405a944669c5fc9ca3570f4

7 years agoRemove pickup gesture settings if sensor is not found. am: 94e0da52fc
Doris Ling [Wed, 12 Oct 2016 00:35:58 +0000 (00:35 +0000)]
Remove pickup gesture settings if sensor is not found. am: 94e0da52fc
am: 79aa718669

Change-Id: Ibd7ad376e17c8a612b87909ffe87e75bb242c3a0

7 years agoMerge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
Doris Ling [Wed, 12 Oct 2016 00:23:48 +0000 (00:23 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
am: 49c0bab8bf

Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99

7 years agoRemove pickup gesture settings if sensor is not found.
Doris Ling [Wed, 12 Oct 2016 00:23:46 +0000 (00:23 +0000)]
Remove pickup gesture settings if sensor is not found.
am: 94e0da52fc

Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9

7 years agoMerge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
Doris Ling [Tue, 11 Oct 2016 23:42:41 +0000 (23:42 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev

7 years agoRemove pickup gesture settings if sensor is not found.
Doris Ling [Tue, 11 Oct 2016 21:19:03 +0000 (14:19 -0700)]
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

7 years agoMerge "Delete "Show CPU usage"" into nyc-mr1-dev am: 09d3961326
Nick Kralevich [Tue, 11 Oct 2016 18:28:05 +0000 (18:28 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev am: 09d3961326
am: 2c89007df6

Change-Id: Iaddfa85f013b44648b12fed164e26d02251471fc

7 years agoDelete "Show CPU usage" am: 73dfef91b2
Nick Kralevich [Tue, 11 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Delete "Show CPU usage" am: 73dfef91b2
am: 0f3067ce58

Change-Id: Ic7a08dfa404e8dc35feb17187fe7067ee868c715

7 years agoMerge "Delete "Show CPU usage"" into nyc-mr1-dev
Nick Kralevich [Tue, 11 Oct 2016 18:14:06 +0000 (18:14 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
am: 09d3961326

Change-Id: Iaa4e4d01ca8a1543994d9ca422991cc25a36d819

7 years agoDelete "Show CPU usage"
Nick Kralevich [Tue, 11 Oct 2016 18:09:16 +0000 (18:09 +0000)]
Delete "Show CPU usage"
am: 73dfef91b2

Change-Id: I3bf3ab7c241980f21ae0b648db4e0e4065d3b848

7 years agoMerge "Delete "Show CPU usage"" into nyc-mr1-dev
Nick Kralevich [Tue, 11 Oct 2016 18:03:25 +0000 (18:03 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev

7 years agoDelete "Show CPU usage"
Nick Kralevich [Tue, 11 Oct 2016 16:03:29 +0000 (09:03 -0700)]
Delete "Show CPU usage"

This functionality hasn't worked since Lollipop.

Bug: 21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff

7 years agoImport translations. DO NOT MERGE am: 64d3e22e11 -s ours am: 9f8644c04f -s ours
Bill Yi [Tue, 11 Oct 2016 15:14:56 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am: 64d3e22e11  -s ours am: 9f8644c04f  -s ours
am: d13a041835  -s ours

Change-Id: Ibcfcbaa91d51944f0861d0f65e50461004db8779

7 years agoImport translations. DO NOT MERGE am: 6acf691f62 -s ours
Bill Yi [Tue, 11 Oct 2016 15:14:42 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am: 6acf691f62  -s ours
am: 557f83edb5  -s ours

Change-Id: I4d4f4c323c27dced0088b588567c7b42f3acb3e1

7 years agoImport translations. DO NOT MERGE am: 64d3e22e11 -s ours
Bill Yi [Tue, 11 Oct 2016 15:09:26 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE am: 64d3e22e11  -s ours
am: 9f8644c04f  -s ours

Change-Id: I7dc4c1f300dd8a3afdd55cca1224c81e83528478

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Oct 2016 15:09:11 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE
am: 6acf691f62  -s ours

Change-Id: I2e8466a2baab0727b0a03ab96589cb0a1bd312a3

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Oct 2016 15:03:11 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE
am: 64d3e22e11  -s ours

Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 10 Oct 2016 19:39:26 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5616dbd321f70984c0386fd5b2e48f608ede25cb
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 10 Oct 2016 19:31:59 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic1133c6ddf9e2230e189751a04c58b953ef2b4c5
Auto-generated-cl: translation import

7 years agoFixed spans getting stripped from disclaimer am: e0b74a6de0
Salvador Martinez [Fri, 7 Oct 2016 21:08:47 +0000 (21:08 +0000)]
Fixed spans getting stripped from disclaimer am: e0b74a6de0
am: e3c31f3aec

Change-Id: Ia05205f27bdaccd7f08e311ef0c24a0af1776f64

7 years agoFixed spans getting stripped from disclaimer
Salvador Martinez [Fri, 7 Oct 2016 21:04:16 +0000 (21:04 +0000)]
Fixed spans getting stripped from disclaimer
am: e0b74a6de0

Change-Id: I5b668306d5e6221f47903179b58ce9b227d6a940

7 years agoFixed spans getting stripped from disclaimer
Salvador Martinez [Fri, 7 Oct 2016 02:26:51 +0000 (19:26 -0700)]
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

7 years agoMerge "The center column of the support tab is back to white" into nyc-mr1-dev am...
Matthew Fritze [Thu, 6 Oct 2016 22:53:47 +0000 (22:53 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev am: 9f95a59b88
am: d983045488

Change-Id: I67fd24b1e7647f0216983d5a16f868c16a90cadc

7 years agoThe center column of the support tab is back to white am: 2d07290453
Matthew Fritze [Thu, 6 Oct 2016 22:53:33 +0000 (22:53 +0000)]
The center column of the support tab is back to white am: 2d07290453
am: 409714d0e4

Change-Id: I6af46ec8fdba17edbb2716704e903c7aedb7d456

7 years agoMerge "The center column of the support tab is back to white" into nyc-mr1-dev
Matthew Fritze [Thu, 6 Oct 2016 22:49:58 +0000 (22:49 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
am: 9f95a59b88

Change-Id: Ic7948520f75b0b8024d9239a87734ae6fa003705

7 years agoThe center column of the support tab is back to white
Matthew Fritze [Thu, 6 Oct 2016 22:49:56 +0000 (22:49 +0000)]
The center column of the support tab is back to white
am: 2d07290453

Change-Id: I14bb5ca55ed267b3144a091e5b0bc636aeaaaa1e

7 years agoMerge "Added onClick logic for domain url list screen" into nyc-mr1-dev am: 8a468ccbdf
Salvador Martinez [Thu, 6 Oct 2016 22:46:46 +0000 (22:46 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am: 8a468ccbdf
am: 17866f0b17

Change-Id: Icc7ae5e2d553a2ef9ad8d568b0e2d90a393256b1

7 years agoAdded onClick logic for domain url list screen am: 26e5760033
Salvador Martinez [Thu, 6 Oct 2016 22:46:32 +0000 (22:46 +0000)]
Added onClick logic for domain url list screen am: 26e5760033
am: 1d383e1220

Change-Id: Ib1e58b680a866dea0b4ac398215d94f6c636f1cc

7 years agoMerge "The center column of the support tab is back to white" into nyc-mr1-dev
Matthew Fritze [Thu, 6 Oct 2016 22:43:28 +0000 (22:43 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev

7 years agoMerge "Added onClick logic for domain url list screen" into nyc-mr1-dev
Salvador Martinez [Thu, 6 Oct 2016 22:42:57 +0000 (22:42 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
am: 8a468ccbdf

Change-Id: Iffe25be2bb7623d3529feb8d0bd115c7b423db72

7 years agoAdded onClick logic for domain url list screen
Salvador Martinez [Thu, 6 Oct 2016 22:42:56 +0000 (22:42 +0000)]
Added onClick logic for domain url list screen
am: 26e5760033

Change-Id: I11428c85ef077b7eee6ec7b6722463e86ac21a9b

7 years agoMerge "Added onClick logic for domain url list screen" into nyc-mr1-dev
Salvador Martinez [Thu, 6 Oct 2016 22:37:05 +0000 (22:37 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE am: a6b32526d7 -s ours
Bill Yi [Thu, 6 Oct 2016 21:55:00 +0000 (21:55 +0000)]
Import translations. DO NOT MERGE am: a6b32526d7  -s ours
am: f6a7a97ab5  -s ours

Change-Id: I51cf96a100e1a84bbc8fbd6dc5ce26b66056ec12

7 years agoMerge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc
Fan Zhang [Thu, 6 Oct 2016 21:54:46 +0000 (21:54 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc
am: 207bb2947e

Change-Id: Ied103f6707f804a8b386d0f0d3df1837c5b98571

7 years agoFix a NPE in confirm lock screen. am: 8b2baed2be
Fan Zhang [Thu, 6 Oct 2016 21:54:30 +0000 (21:54 +0000)]
Fix a NPE in confirm lock screen. am: 8b2baed2be
am: da856402f4

Change-Id: Ia13e941b8766ae128bf31f224656f7e862e0b059

7 years agoSwitch to static warning threshold when adopting. am: bd7adb9313
Jeff Sharkey [Thu, 6 Oct 2016 21:54:16 +0000 (21:54 +0000)]
Switch to static warning threshold when adopting. am: bd7adb9313
am: da414d0afe

Change-Id: I111c8b3ea63deb6e9797a520f1431d73adc16c99

7 years agoMerge "Add condition check for double tap gesture settings." into nyc-mr1-dev am...
Jonathan Nieder [Thu, 6 Oct 2016 21:52:45 +0000 (21:52 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am: 6cab381bc2
am: 64136f30d1

Change-Id: I3ee238ba4cc3ec5abc1ecc950dc01e7b08a5d62a

7 years agoAdd condition check for double tap gesture settings. am: c8b7555fc9
Doris Ling [Thu, 6 Oct 2016 21:52:33 +0000 (21:52 +0000)]
Add condition check for double tap gesture settings. am: c8b7555fc9
am: 7f62890cad

Change-Id: If89dfb781ca8b8e0a7dd8e0b1f59e32ae6d4d98f

7 years agoMerge "Fix bug preventing users from clicking settings suggestions twice" into nyc...
Matthew Fritze [Thu, 6 Oct 2016 21:52:02 +0000 (21:52 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381
am: 62fcf9369f

Change-Id: I7aa60f53cf44d5090a648551ef2ff02431981ff0

7 years agoFix bug preventing users from clicking settings suggestions twice am: f265dbc447
Matthew Fritze [Thu, 6 Oct 2016 21:51:47 +0000 (21:51 +0000)]
Fix bug preventing users from clicking settings suggestions twice am: f265dbc447
am: e5e60eccaf

Change-Id: I956ed80ce27ec50378901111f5679b163719628f

7 years agoGive CTS the handle it expects to remove PIN. am: 7be1b5923f
Jeff Sharkey [Thu, 6 Oct 2016 21:15:12 +0000 (21:15 +0000)]
Give CTS the handle it expects to remove PIN. am: 7be1b5923f
am: 4ae8eb2aae

Change-Id: Ic3ee8be685d83b8be07f2e0129e3a7573ad4e920

7 years agoImport translations. DO NOT MERGE am: 972c78b4ee -s ours am: e87f2bbaa0 -s ours
Bill Yi [Thu, 6 Oct 2016 21:10:21 +0000 (21:10 +0000)]
Import translations. DO NOT MERGE am: 972c78b4ee  -s ours am: e87f2bbaa0  -s ours
am: 784b1cbf35  -s ours

Change-Id: I9ffd9b5af5b44dd0e9dfb0a2ee231ce619ce9d71

7 years agoMerge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am: 9c54a67d66
Lei Yu [Thu, 6 Oct 2016 21:10:06 +0000 (21:10 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am: 9c54a67d66
am: d7f2c10f94

Change-Id: Idd81a0beb1b5999696e6f47ab6fb64110a4f0793

7 years agoAdd "FILTER_NOT_HIDE" for all app filters. am: d785a8db78
jackqdyulei [Thu, 6 Oct 2016 21:00:31 +0000 (21:00 +0000)]
Add "FILTER_NOT_HIDE" for all app filters. am: d785a8db78
am: 00ed827516

Change-Id: I108753ea9af54aba754a8899f02a3f100f3b38fd

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9 -s ours
Bill Yi [Thu, 6 Oct 2016 21:00:03 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9  -s ours
am: f0be222981  -s ours

Change-Id: I22381a4a7bc572765718c6003769431b0974567c

7 years agoImport translations. DO NOT MERGE am: 8aee525418 -s ours
Bill Yi [Thu, 6 Oct 2016 20:59:44 +0000 (20:59 +0000)]
Import translations. DO NOT MERGE am: 8aee525418  -s ours
am: 47f6271d15  -s ours

Change-Id: I9f2c7f8ffce896e53ca32192b6902760b9939bb2

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)]
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
am: bb529c267d

Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:17 +0000 (20:59 +0000)]
resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
am: be3924c1b6

Change-Id: Ifecf71ed6b0c756fb59ce8fa4293aebb68158f89

7 years agoPrevent monkey tests from crashing with race conditions am: 7ac78f2daf
Matthew Fritze [Thu, 6 Oct 2016 20:59:03 +0000 (20:59 +0000)]
Prevent monkey tests from crashing with race conditions am: 7ac78f2daf
am: 9264154bee

Change-Id: If30a93ce12ee3100f6fea14f4765e3428b122ad3

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours
Bill Yi [Thu, 6 Oct 2016 20:58:50 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd  -s ours
am: ffae7d82c3  -s ours

Change-Id: Iff1708277ff2827a631228d4c4a286e503543190

7 years agoImport translations. DO NOT MERGE am: ae33f8e62c -s ours
Bill Yi [Thu, 6 Oct 2016 20:58:37 +0000 (20:58 +0000)]
Import translations. DO NOT MERGE am: ae33f8e62c  -s ours
am: b1f3f659f1  -s ours

Change-Id: Ibb7e5a0d26b14095d632979a5e57fd8bed9966f1

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
Philip P. Moltmann [Thu, 6 Oct 2016 20:58:22 +0000 (20:58 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
am: ae23c07073

Change-Id: I9ccd46e5d5d15685dccf8b9a3dbd5a82b56d6bda

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 6 Oct 2016 20:49:41 +0000 (20:49 +0000)]
Import translations. DO NOT MERGE
am: a6b32526d7  -s ours

Change-Id: I3235d07dafe77d05dadeadc3224469bd225ae7f8

7 years agoMerge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
Fan Zhang [Thu, 6 Oct 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
am: 6cea122bfc

Change-Id: Iba84fbd3eedd674fa038fa515dba507d2c4b9e0e

7 years agoFix a NPE in confirm lock screen.
Fan Zhang [Thu, 6 Oct 2016 20:49:10 +0000 (20:49 +0000)]
Fix a NPE in confirm lock screen.
am: 8b2baed2be

Change-Id: I4c16a428b3409b33815740c734b3390192866a20

7 years agoSwitch to static warning threshold when adopting.
Jeff Sharkey [Thu, 6 Oct 2016 20:48:56 +0000 (20:48 +0000)]
Switch to static warning threshold when adopting.
am: bd7adb9313

Change-Id: Ib7e82d50f7d3e98d3a669a9508d6cee9871a4383

7 years agoMerge "Add condition check for double tap gesture settings." into nyc-mr1-dev
Jonathan Nieder [Thu, 6 Oct 2016 20:48:23 +0000 (20:48 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev
am: 6cab381bc2

Change-Id: I4e140a32c84c820761176e816cbb88c4be46ef70

7 years agoAdd condition check for double tap gesture settings.
Doris Ling [Thu, 6 Oct 2016 20:47:32 +0000 (20:47 +0000)]
Add condition check for double tap gesture settings.
am: c8b7555fc9

Change-Id: I7fa9e76725a7920d36936ffd4a737e8ed7eb8107

7 years agoMerge "Fix bug preventing users from clicking settings suggestions twice" into nyc...
Matthew Fritze [Thu, 6 Oct 2016 20:47:09 +0000 (20:47 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
am: fb42828381

Change-Id: I77f828913d3a941f040c6548fc99e86033e432a6

7 years agoFix bug preventing users from clicking settings suggestions twice
Matthew Fritze [Thu, 6 Oct 2016 20:47:07 +0000 (20:47 +0000)]
Fix bug preventing users from clicking settings suggestions twice
am: f265dbc447

Change-Id: I0e9a1a92d84f2ae2dc783ddea4f6bcb728a72a52

7 years agoGive CTS the handle it expects to remove PIN.
Jeff Sharkey [Thu, 6 Oct 2016 20:41:48 +0000 (20:41 +0000)]
Give CTS the handle it expects to remove PIN.
am: 7be1b5923f

Change-Id: If949083726e0809d6ed45083282acda2255f546b

7 years agoImport translations. DO NOT MERGE am: 972c78b4ee -s ours
Bill Yi [Thu, 6 Oct 2016 20:41:23 +0000 (20:41 +0000)]
Import translations. DO NOT MERGE am: 972c78b4ee  -s ours
am: e87f2bbaa0  -s ours

Change-Id: Id32e92fba6ba6fbb791e0afd275cb59ae1dfe96e

7 years agoMerge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
Lei Yu [Thu, 6 Oct 2016 20:41:04 +0000 (20:41 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
am: 9c54a67d66

Change-Id: Iba9f294bbbd1fd32e55950a6ddcc73604e4d0bea

7 years agoAdd "FILTER_NOT_HIDE" for all app filters.
jackqdyulei [Thu, 6 Oct 2016 20:28:52 +0000 (20:28 +0000)]
Add "FILTER_NOT_HIDE" for all app filters.
am: d785a8db78

Change-Id: I779bc9de3e094c80c1749ac65acb932dc251f451

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 6 Oct 2016 20:28:13 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f91ca6bcd9  -s ours

Change-Id: Id18279ec5ccafbdcc0b4de8c24342f2c41ae9d10

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 6 Oct 2016 20:28:12 +0000 (20:28 +0000)]
Import translations. DO NOT MERGE
am: 8aee525418  -s ours

Change-Id: If58e31763e5f3b014126005d2816532323aa13f3

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:51 +0000 (20:27 +0000)]
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
am: 365d95b69a

Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:49 +0000 (20:27 +0000)]
resolve merge conflicts of f2801e4 to nyc-mr1-dev
am: b01c080b08

Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a

7 years agoPrevent monkey tests from crashing with race conditions
Matthew Fritze [Thu, 6 Oct 2016 20:27:36 +0000 (20:27 +0000)]
Prevent monkey tests from crashing with race conditions
am: 7ac78f2daf

Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 6 Oct 2016 20:27:09 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 0d424ef9bd  -s ours

Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 6 Oct 2016 20:27:08 +0000 (20:27 +0000)]
Import translations. DO NOT MERGE
am: ae33f8e62c  -s ours

Change-Id: Ibb93c7fcea5a052cbafc28b445bd85810a331122

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev
Philip P. Moltmann [Thu, 6 Oct 2016 20:26:50 +0000 (20:26 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
am: f9ca06b367

Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9

7 years agoUSB restriction is similar to media restriction am: 13ee50be48
Philip P. Moltmann [Thu, 6 Oct 2016 20:07:13 +0000 (20:07 +0000)]
USB restriction is similar to media restriction am: 13ee50be48
am: a78fced068

Change-Id: Icb1dbfba6cf3e1a5097cc32b33330b8025e6c46d

7 years agoUSB restriction is similar to media restriction
Philip P. Moltmann [Thu, 6 Oct 2016 19:55:42 +0000 (19:55 +0000)]
USB restriction is similar to media restriction
am: 13ee50be48

Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 6 Oct 2016 00:36:53 +0000 (17:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id06ae993d6e5f0bb1249f5b94e96c73d1c1a183d
Auto-generated-cl: translation import

7 years agoAdded onClick logic for domain url list screen
Salvador Martinez [Wed, 5 Oct 2016 21:46:34 +0000 (14:46 -0700)]
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

7 years agoThe center column of the support tab is back to white
Matthew Fritze [Wed, 5 Oct 2016 18:07:08 +0000 (11:07 -0700)]
The center column of the support tab is back to white

Regression came in here:
ag/1492761

Change-Id: I7ea5015abbe78d06b6df17d3caa3177642539023
Fixes:31958339
Test: Manual

7 years agoMerge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
TreeHugger Robot [Wed, 5 Oct 2016 19:52:02 +0000 (19:52 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev

7 years agoSwitch to static warning threshold when adopting.
Jeff Sharkey [Wed, 5 Oct 2016 17:21:22 +0000 (11:21 -0600)]
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

7 years agoFix a NPE in confirm lock screen.
Fan Zhang [Mon, 3 Oct 2016 16:05:55 +0000 (09:05 -0700)]
Fix a NPE in confirm lock screen.

The NPE happens is when using pin later. It's too late to recover if we
just catch the NPE where it happens, so we should early terminate the
call by adding TextUtil.isEmpty(pin) check.

Change-Id: Id280cd1b8781678540c9ea281b3186edd04d61f9
Fixes: 31895774
Test: make RunSettingsRoboTests
Test: manually enter correct/wrong/empty password/pin in confirm lock UI
(cherry picked from commit 774e1d8443fa551bdcfb54de2fd478db42e70a16)

7 years agoSuppress notif block/silence settings for essential packages.
Dan Sandler [Tue, 4 Oct 2016 19:24:23 +0000 (15:24 -0400)]
Suppress notif block/silence settings for essential packages.

Companion to change I6b8fa374.

Bug: 31360343
Test: Manual. With config_nonBlockableNotificationPackages
      set to include com.android.dialer, examine Dialer's
      notification settings. Be sure to test with advanced
      notification controls enabled in System UI Tuner.
Change-Id: Ifbe13acf4cb02d6642f5c80e000f5b558f289920

7 years agoMerge "Add condition check for double tap gesture settings." into nyc-mr1-dev
Jonathan Nieder [Wed, 5 Oct 2016 01:08:03 +0000 (01:08 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev

7 years agoMerge "Fix bug preventing users from clicking settings suggestions twice" into nyc...
Matthew Fritze [Tue, 4 Oct 2016 22:51:51 +0000 (22:51 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev

7 years agoAdd condition check for double tap gesture settings.
Doris Ling [Tue, 4 Oct 2016 22:31:58 +0000 (15:31 -0700)]
Add condition check for double tap gesture settings.

Only shows the double tap gesture preference if the config is enabled.

Test: manual - launch gesture settings on different devices and check
for double tap preference. Auto test pending.
Bug: 31930457

Change-Id: Id972f60035d0c74f0832395f0229691cd3296d60

7 years agoFix bug preventing users from clicking settings suggestions twice
Matthew Fritze [Tue, 4 Oct 2016 20:39:27 +0000 (13:39 -0700)]
Fix bug preventing users from clicking settings suggestions twice

In an attempt to fix a monkey test crash which would open a
suggestion, click back and tap the same one again. The change
unfortunately prevented this for all users, but was not caught
because of a debug flag set on my device. A unit test will be added
to master to catch such cases, as tracked by this bug:
b/31937112

Change-Id: Ib1cff07e54903df687454bdbf2ed1416485ab34f
Fixes: 31926102
Test: Manual

7 years agoGive CTS the handle it expects to remove PIN.
Jeff Sharkey [Tue, 4 Oct 2016 19:43:35 +0000 (13:43 -0600)]
Give CTS the handle it expects to remove PIN.

When the Direct Boot tests go to remove the PIN set in previous
tests, it needs to find the option that will remove the PIN.  Recent
changes for fingerprint caused this "none" option to be hidden, so
assign the "none" ID to the "skip" option.

Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest
Bug: 31160946
Change-Id: I0b34cbfae45d1db8ee58a5ef66738414f5e2fc27

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 4 Oct 2016 20:05:52 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE
am: 972c78b4ee  -s ours

Change-Id: I526a783783c7ecda889b918ecfbafca399371895

7 years agoMerge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
Lei Yu [Tue, 4 Oct 2016 19:51:22 +0000 (19:51 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 4 Oct 2016 18:51:04 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 4 Oct 2016 18:18:12 +0000 (11:18 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 31827713
Change-Id: Ib9bed5a9d8a9237935842d496c8f1630dad64c27

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 4 Oct 2016 05:27:10 +0000 (22:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iab5c7c6153bc12f50cc443225c0e562a795a7731
Auto-generated-cl: translation import

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
Lorenzo Colitti [Mon, 3 Oct 2016 23:37:09 +0000 (23:37 +0000)]
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev

7 years agoAdd "FILTER_NOT_HIDE" for all app filters.
jackqdyulei [Mon, 3 Oct 2016 21:01:46 +0000 (14:01 -0700)]
Add "FILTER_NOT_HIDE" for all app filters.

The "FILTER_NOT_HIDE" is used to filter out apps that "blacklisted"
by the carrier. So when user insert a specific sim card, these apps
are hiden in settings > apps unless user enable them.

Bug: 31823872
Test: Manual
Change-Id: I28a38b5780cb63fe22af12d80cc24e965b2b83cf

7 years agoPrevent monkey tests from crashing with race conditions
Matthew Fritze [Mon, 3 Oct 2016 20:26:07 +0000 (13:26 -0700)]
Prevent monkey tests from crashing with race conditions

Change-Id: I3eb7d5549aba2f9684f97e8ee7c56c469f9daae0
Fixes: 31856366
Test: None, monkey test race conditions.

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev
Lorenzo Colitti [Mon, 3 Oct 2016 17:28:58 +0000 (02:28 +0900)]
resolve merge conflicts of f2801e4 to nyc-mr1-dev

Change-Id: I8a9723e8c070cd7f99c39fe5918335847f0b6248

7 years agoUpdate text of wifi to cell autoswitch toggle
Hugo Benichi [Thu, 29 Sep 2016 00:16:55 +0000 (09:16 +0900)]
Update text of wifi to cell autoswitch toggle

Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 1 Oct 2016 08:55:31 +0000 (08:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Oct 2016 01:11:46 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: I50d10792c922453215b9af11d6867626c2ce2152
Auto-generated-cl: translation import