Matthew Fritze
dabb84876b
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381
...
am: 62fcf9369f
2016-10-06 21:52:02 +00:00
Matthew Fritze
5b509e12ff
Fix bug preventing users from clicking settings suggestions twice am: f265dbc447
...
am: e5e60eccaf
2016-10-06 21:51:47 +00:00
Jeff Sharkey
2eda02e617
Give CTS the handle it expects to remove PIN. am: 7be1b5923f
...
am: 4ae8eb2aae
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
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
2016-10-06 21:10:06 +00:00
jackqdyulei
15c14f0cc2
Add "FILTER_NOT_HIDE" for all app filters. am: d785a8db78
...
am: 00ed827516
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
2016-10-06 21:00:03 +00:00
Bill Yi
b30d988a1c
Import translations. DO NOT MERGE am: 8aee525418 -s ours
...
am: 47f6271d15
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
2016-10-06 20:59:31 +00:00
Lorenzo Colitti
54ec71200b
resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
...
am: be3924c1b6
2016-10-06 20:59:17 +00:00
Matthew Fritze
927007dd53
Prevent monkey tests from crashing with race conditions am: 7ac78f2daf
...
am: 9264154bee
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
2016-10-06 20:58:50 +00:00
Bill Yi
5fb2b6c1c5
Import translations. DO NOT MERGE am: ae33f8e62c -s ours
...
am: b1f3f659f1
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
2016-10-06 20:58:22 +00:00
Matthew Fritze
62fcf9369f
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
...
am: fb42828381
2016-10-06 20:47:09 +00:00
Matthew Fritze
e5e60eccaf
Fix bug preventing users from clicking settings suggestions twice
...
am: f265dbc447
2016-10-06 20:47:07 +00:00
Jeff Sharkey
4ae8eb2aae
Give CTS the handle it expects to remove PIN.
...
am: 7be1b5923f
2016-10-06 20:41:48 +00:00
Bill Yi
784b1cbf35
Import translations. DO NOT MERGE am: 972c78b4ee -s ours
...
am: e87f2bbaa0
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
2016-10-06 20:41:04 +00:00
jackqdyulei
00ed827516
Add "FILTER_NOT_HIDE" for all app filters.
...
am: d785a8db78
2016-10-06 20:28:52 +00:00
Bill Yi
f0be222981
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: f91ca6bcd9
2016-10-06 20:28:13 +00:00
Bill Yi
47f6271d15
Import translations. DO NOT MERGE
...
am: 8aee525418
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
2016-10-06 20:27:51 +00:00
Lorenzo Colitti
be3924c1b6
resolve merge conflicts of f2801e4 to nyc-mr1-dev
...
am: b01c080b08
2016-10-06 20:27:49 +00:00
Matthew Fritze
9264154bee
Prevent monkey tests from crashing with race conditions
...
am: 7ac78f2daf
2016-10-06 20:27:36 +00:00
Bill Yi
ffae7d82c3
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 0d424ef9bd
2016-10-06 20:27:09 +00:00
Bill Yi
b1f3f659f1
Import translations. DO NOT MERGE
...
am: ae33f8e62c
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
2016-10-06 20:26:50 +00:00
Philip P. Moltmann
58154e8c27
USB restriction is similar to media restriction am: 13ee50be48
...
am: a78fced068
2016-10-06 20:07:13 +00:00
Philip P. Moltmann
a78fced068
USB restriction is similar to media restriction
...
am: 13ee50be48
2016-10-06 19:55:42 +00:00
Matthew Fritze
fb42828381
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
2016-10-04 22:51:52 +00:00
Matthew Fritze
f265dbc447
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
2016-10-04 13:39:27 -07:00
Jeff Sharkey
7be1b5923f
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
2016-10-04 20:33:39 +00:00
Bill Yi
e87f2bbaa0
Import translations. DO NOT MERGE
...
am: 972c78b4ee
2016-10-04 20:05:52 +00:00
Lei Yu
9c54a67d66
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
2016-10-04 19:51:26 +00:00
Bill Yi
f91ca6bcd9
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-04 18:51:05 +00:00
Bill Yi
972c78b4ee
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 31827713
Change-Id: Ib9bed5a9d8a9237935842d496c8f1630dad64c27
2016-10-04 11:18:12 -07:00
Bill Yi
8aee525418
Import translations. DO NOT MERGE
...
Change-Id: Iab5c7c6153bc12f50cc443225c0e562a795a7731
Auto-generated-cl: translation import
2016-10-03 22:27:10 -07:00
Lorenzo Colitti
365d95b69a
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
2016-10-03 23:37:10 +00:00
jackqdyulei
d785a8db78
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
2016-10-03 15:14:12 -07:00
Matthew Fritze
7ac78f2daf
Prevent monkey tests from crashing with race conditions
...
Change-Id: I3eb7d5549aba2f9684f97e8ee7c56c469f9daae0
Fixes: 31856366
Test: None, monkey test race conditions.
2016-10-03 13:53:51 -07:00
Lorenzo Colitti
b01c080b08
resolve merge conflicts of f2801e4 to nyc-mr1-dev
...
Change-Id: I8a9723e8c070cd7f99c39fe5918335847f0b6248
2016-10-04 02:28:58 +09:00
Hugo Benichi
f2801e46d1
Update text of wifi to cell autoswitch toggle
...
Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0
2016-10-04 00:56:53 +09:00
TreeHugger Robot
0d424ef9bd
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-01 08:55:31 +00:00
Bill Yi
ae33f8e62c
Import translations. DO NOT MERGE
...
Change-Id: I50d10792c922453215b9af11d6867626c2ce2152
Auto-generated-cl: translation import
2016-09-30 18:11:46 -07:00
Philip P. Moltmann
f9ca06b367
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
2016-10-01 00:16:12 +00:00
Matthew Fritze
cbd7df8e5d
Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
...
am: c94ac39096
2016-09-30 22:48:12 +00:00
Matthew Fritze
8bf5fa437e
Prevent double tap on suggestions am: 703dc60b14
...
am: ae3ad11e69
2016-09-30 22:47:58 +00:00
Matthew Fritze
0d90d66c3b
Tablet Settings support tab has start/end padding am: 839be498b6
...
am: 4de4d8801d
2016-09-30 22:47:45 +00:00
Matthew Fritze
c94ac39096
Merge "Prevent double tap on suggestions" into nyc-mr1-dev
...
am: d8435d57d2
2016-09-30 22:41:33 +00:00
