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
Doris Ling
c8b7555fc9
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
2016-10-04 15:31:58 -07: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
Matthew Fritze
ae3ad11e69
Prevent double tap on suggestions
...
am: 703dc60b14
2016-09-30 22:41:32 +00:00
Matthew Fritze
4de4d8801d
Tablet Settings support tab has start/end padding
...
am: 839be498b6
2016-09-30 22:38:23 +00:00
TreeHugger Robot
d8435d57d2
Merge "Prevent double tap on suggestions" into nyc-mr1-dev
2016-09-30 22:33:46 +00:00
Philip P. Moltmann
13ee50be48
USB restriction is similar to media restriction
...
Bug: 31472955
Change-Id: I3682ccd102565982c434d70fc0d907b1aa779689
(cherry picked from commit 58e2b50292
2016-09-30 21:18:14 +00:00
Matthew Fritze
839be498b6
Tablet Settings support tab has start/end padding
...
Change-Id: Ifdc74af0edbd1b44c4f73b497f16f8edcf647ede
Fixes: 31583422
Tests: Visual Inspection
2016-09-30 21:16:30 +00:00
Matthew Fritze
703dc60b14
Prevent double tap on suggestions
...
Change-Id: I963d96b75cb5d464b6f91cf0824aee6e21cfeff0
Fixes: 31856366
2016-09-30 14:13:53 -07:00
Matthew Fritze
3d4df23a17
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250
...
am: b0722aeb88
2016-09-30 00:22:31 +00:00
Matthew Fritze
1869973e12
Support dialog disclaimer text now appears properly am: adc5555acf
...
am: bbe0e8a30b
2016-09-30 00:22:26 +00:00
Matthew Fritze
b0722aeb88
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
...
am: cf0f301250
2016-09-30 00:20:29 +00:00
Matthew Fritze
bbe0e8a30b
Support dialog disclaimer text now appears properly
...
am: adc5555acf
2016-09-30 00:20:27 +00:00
Matthew Fritze
cf0f301250
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
2016-09-30 00:12:55 +00:00
Garfield Tan
af840b584d
Launch other info in storage in correct user id. am: 493bf348b9
...
am: 1ab4f4b816
2016-09-29 23:29:21 +00:00
Garfield Tan
1ab4f4b816
Launch other info in storage in correct user id.
...
am: 493bf348b9
2016-09-29 23:23:50 +00:00
Matthew Fritze
adc5555acf
Support dialog disclaimer text now appears properly
...
The string override between Settings and SettigsGoogle was not properly
distinguishing, and was defaulting to the AOSP version.
Bug: 31827726
Test: Manual
Change-Id: Iebd8681fb4f040e956f05fb0f5d96deae9eec26f
2016-09-29 22:32:10 +00:00
Garfield Tan
493bf348b9
Launch other info in storage in correct user id.
...
Bug: 31592290
Change-Id: I816668c7ff9d1b443d4b49e17bdcfa39ef335aee
2016-09-29 14:45:50 -07:00
Bill Yi
58fb70211c
Import translations. DO NOT MERGE am: dccfc04a3e -s ours am: ae35fa061e -s ours
...
am: a69e26abbf
2016-09-29 08:01:47 +00:00
Bill Yi
1ed1b99ad0
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours
...
am: c53fb015d9
2016-09-29 07:57:41 +00:00
Bill Yi
d44a01ba45
Import translations. DO NOT MERGE am: 4ae03656ac -s ours
...
am: ae3ec3984d
2016-09-29 07:57:26 +00:00
Bill Yi
a69e26abbf
Import translations. DO NOT MERGE am: dccfc04a3e -s ours
...
am: ae35fa061e
2016-09-29 07:57:16 +00:00
Bill Yi
ae35fa061e
Import translations. DO NOT MERGE
...
am: dccfc04a3e
2016-09-29 07:53:15 +00:00
Bill Yi
c53fb015d9
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: f497c48345
2016-09-29 07:48:48 +00:00
Bill Yi
ae3ec3984d
Import translations. DO NOT MERGE
...
am: 4ae03656ac
2016-09-29 07:48:46 +00:00
TreeHugger Robot
f497c48345
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-09-29 07:40:48 +00:00
Bill Yi
dccfc04a3e
Import translations. DO NOT MERGE
...
Change-Id: I0cd1cb776f4dda8b02f683d92cda3efedff989bb
Auto-generated-cl: translation import
2016-09-28 23:25:18 -07:00
Bill Yi
4ae03656ac
Import translations. DO NOT MERGE
...
Change-Id: I4a6114d77d04143e22aa02f591cc6f7b75444d46
Auto-generated-cl: translation import
2016-09-28 23:20:25 -07:00
Hugo Benichi
f153b4bfc8
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
...
am: 9bd60dd8ac
2016-09-29 03:50:16 +00:00
Hugo Benichi
55e04b82af
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4
...
am: b00a9135ba
2016-09-29 03:50:01 +00:00
Hugo Benichi
9bd60dd8ac
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
...
am: c81e1141cc
2016-09-29 03:46:11 +00:00
Hugo Benichi
b00a9135ba
Update text of wifi to cell autoswitch toggle
...
am: 1968fb1fd4
2016-09-29 03:46:10 +00:00
