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
Stephen Chen
9d66f6f738
Merge "Fix icon loading in EditUserInfo dialog on orientation change."
2016-10-06 22:36:52 +00:00
TreeHugger Robot
840208bc77
Merge "Use a Digit TtsSpan for pairing pins for talkback."
2016-10-06 22:12:30 +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
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
Fan Zhang
71ab9605a3
Use a Digit TtsSpan for pairing pins for talkback.
...
Fixes: 31539689
Test: manually enabled talkback and focused on bt pairing pin. Verified
read-out is digits instead of a big number.
Change-Id: I71c53094762a71459e70485470684c515053b600
2016-10-06 13:17:06 -07:00
Philip P. Moltmann
58154e8c27
USB restriction is similar to media restriction am: 13ee50be48
...
am: a78fced068
Change-Id: Icb1dbfba6cf3e1a5097cc32b33330b8025e6c46d
2016-10-06 20:07:13 +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
TreeHugger Robot
9a54e843a7
Merge "Add test for new DashboardFragment and PreferenceController"
2016-10-06 19:22:21 +00:00
TreeHugger Robot
ced3676723
Merge "Import translations. DO NOT MERGE"
2016-10-06 18:02:34 +00:00