Commit Graph

61072 Commits

Author SHA1 Message Date
tim peng
a4bdcf2475 Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911 am: 495a9a3816
Change-Id: Icc0c06e35c2ea5d698591c6540e793421ef51bc2
2020-04-14 03:03:51 +00:00
tim peng
495a9a3816 Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911
Change-Id: Ic6898a2f807047f0c14b8b2723bb29b0acb7cc18
2020-04-14 02:41:10 +00:00
tim peng
3d75454911 Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2
Change-Id: Idceeb2afec57dc26bc9407e4f8d37bfc0aba7c3e
2020-04-14 02:18:00 +00:00
tim peng
2c9d412ba2 Merge "Output switcher subtitle modification" into rvc-dev 2020-04-14 01:56:06 +00:00
TreeHugger Robot
350ec4956e Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6 am: 4d865d9304 am: 0b4a8f3e65
Change-Id: Ie633c54e846f2b57fbe786053d5b033e1f3d018c
2020-04-13 14:21:33 +00:00
Julia Reynolds
6e1aec5231 Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3 am: 9768e4417b am: 122e878967
Change-Id: I435f96797d9e876fee234ef0b28ceca0abd9df26
2020-04-13 14:21:26 +00:00
TreeHugger Robot
0b4a8f3e65 Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6 am: 4d865d9304
Change-Id: I7fe8970f9ad9ba501ddb01af1d137096dc818717
2020-04-13 14:05:01 +00:00
Julia Reynolds
122e878967 Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3 am: 9768e4417b
Change-Id: I483273b6b747ecfe24871e6fe004375ba8c899fa
2020-04-13 14:04:54 +00:00
TreeHugger Robot
4d865d9304 Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6
Change-Id: I514903cc5e571735941adb10e6de9c0c8ca2e411
2020-04-13 13:43:06 +00:00
Julia Reynolds
9768e4417b Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3
Change-Id: I55f08a8db4236cfbc23a3b602b1fc0c8e7138519
2020-04-13 13:42:58 +00:00
TreeHugger Robot
c858484fe6 Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev 2020-04-13 13:31:39 +00:00
TreeHugger Robot
585c19dc84 Merge "[Wi-Fi] Fix NetworkRequestErrorDialogFragment exception when rotation" into rvc-dev am: dccb008642 am: e75fc6dfd0 am: a403382bf1
Change-Id: I843bf3ef5a1c01af815de3639339f5d0b433d856
2020-04-13 13:27:46 +00:00
Julia Reynolds
5c4c2ed6b3 Merge "Fixes for notification history" into rvc-dev 2020-04-13 13:11:06 +00:00
TreeHugger Robot
a403382bf1 Merge "[Wi-Fi] Fix NetworkRequestErrorDialogFragment exception when rotation" into rvc-dev am: dccb008642 am: e75fc6dfd0
Change-Id: Id0f69d372596788601dff76559bb7a1a5e0ee8e5
2020-04-13 13:07:38 +00:00
TreeHugger Robot
e75fc6dfd0 Merge "[Wi-Fi] Fix NetworkRequestErrorDialogFragment exception when rotation" into rvc-dev am: dccb008642
Change-Id: I0841cbfcaabfc3800fe0eb4d65a033aa4b39ff43
2020-04-13 12:43:49 +00:00
TreeHugger Robot
dccb008642 Merge "[Wi-Fi] Fix NetworkRequestErrorDialogFragment exception when rotation" into rvc-dev 2020-04-13 12:21:54 +00:00
Tim Peng
eb0531f0df Output switcher subtitle modification
-Change from null to "Switch output"
-Update test case

Bug: 153834179
Test: make -j42 RunSettingsRoboTests
Change-Id: I184e78292e982f8a93b74612331a1d2cab28d07a
2020-04-13 11:49:18 +00:00
PO HUNG CHEN
7b45c96787 Merge "Pathfind a way to Validate DSU before releasing GSI" into rvc-dev am: bdcff696d5 am: 0a696ab342 am: e225b2b426
Change-Id: I02201c136dcc4a11c339f348f8d2658da86e1164
2020-04-13 09:17:23 +00:00
TreeHugger Robot
df54467034 Merge "Fix breadcrumb of search results provided by Settings" into rvc-dev am: 678529b68b am: 2344d9540f am: d7615bcae3
Change-Id: I974526896a86c3f51569b38f35e1820aae7257c5
2020-04-13 09:17:12 +00:00
PO HUNG CHEN
e225b2b426 Merge "Pathfind a way to Validate DSU before releasing GSI" into rvc-dev am: bdcff696d5 am: 0a696ab342
Change-Id: I5e66aef19bfc68be9a9c7b13e2c88bd836b87afa
2020-04-13 09:02:18 +00:00
TreeHugger Robot
d7615bcae3 Merge "Fix breadcrumb of search results provided by Settings" into rvc-dev am: 678529b68b am: 2344d9540f
Change-Id: I7bd12140dcac03e54289c86eda4e8fc1a77e3247
2020-04-13 09:02:12 +00:00
PO HUNG CHEN
0a696ab342 Merge "Pathfind a way to Validate DSU before releasing GSI" into rvc-dev am: bdcff696d5
Change-Id: Icc37dc719bcdb7dc46c53fb9e84178537c744c17
2020-04-13 08:39:30 +00:00
TreeHugger Robot
2344d9540f Merge "Fix breadcrumb of search results provided by Settings" into rvc-dev am: 678529b68b
Change-Id: Ic90bcb4da6f9aaf6fee44d6803d2938e4d455718
2020-04-13 08:39:23 +00:00
PO HUNG CHEN
bdcff696d5 Merge "Pathfind a way to Validate DSU before releasing GSI" into rvc-dev 2020-04-13 08:35:28 +00:00
TreeHugger Robot
678529b68b Merge "Fix breadcrumb of search results provided by Settings" into rvc-dev 2020-04-13 07:57:28 +00:00
Howard Chen
3562ec3196 Pathfind a way to Validate DSU before releasing GSI
Provide an alternative DSU portal for testing. It can be enabled or
disabled with the setprop command.

Test: Developer Settings -> DSULoader and check logcat
Bug: 152403883
Change-Id: Id1a7bb2a03d7243299f639e654a1c1a086b87545
2020-04-13 07:09:09 +00:00
Arc Wang
4601d62089 [Wi-Fi] Fix NetworkRequestErrorDialogFragment exception when rotation
When rotating an androidx fragment, it uses default constructor
to instantiate the new fragment instance. Every androidx fragment
should not set private scope to it's default constructor.

Bug: 153824549
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestErrorDialogFragmentTest
Change-Id: Ie1be0e033aa85d37cb4d85193b05beab72d4d8e7
2020-04-13 14:59:49 +08:00
TreeHugger Robot
36d89020d1 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf am: 5c35333116
Change-Id: If31b02a752fe4dee2fbe8979c66372aad8baf447
2020-04-13 03:39:03 +00:00
George Chang
45c71c6223 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a am: 1cfa1b1208
Change-Id: Ib32ae836ec369ba317fb967d804c88671861fb81
2020-04-13 03:38:56 +00:00
TreeHugger Robot
5c35333116 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf
Change-Id: I308a6ff8149fccd6fca0a301978c88b836c0cf6d
2020-04-13 03:20:16 +00:00
George Chang
1cfa1b1208 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a
Change-Id: Id356d8ea6af7b1e655b5964c4920bf1dde18f9e4
2020-04-13 03:20:08 +00:00
TreeHugger Robot
a287641adf Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f
Change-Id: Id19154bf9ae37556f4d2284cb4168a76405aeb83
2020-04-13 02:59:19 +00:00
George Chang
5a6d05885a Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7
Change-Id: I96469f4d0938d9f5f913ee531d4e5e72a11a7ed4
2020-04-13 02:59:05 +00:00
TreeHugger Robot
c56bcb5e7f Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev 2020-04-13 02:45:04 +00:00
George Chang
0181643bb7 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev 2020-04-13 02:43:35 +00:00
George Chang
28895f2822 [NFC] Disable contactless payments when no payment application installed
Bug: 153821082
Bug: 149270345
Test: Check settings
Change-Id: I5162ecb07c26a33427305b6cf65829b2c61ad317
2020-04-13 01:53:23 +00:00
TreeHugger Robot
84559ccf8f Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: 0260b6bc92
Change-Id: I4121edd2128f1c451b508b12be4460b280de8191
2020-04-13 01:30:59 +00:00
TreeHugger Robot
0260b6bc92 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3
Change-Id: I05c0cf2645d1780e40f82d34c39506c83bde43da
2020-04-13 01:13:01 +00:00
TreeHugger Robot
35d8c0bdb3 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872
Change-Id: Ifbd95c73fd5e862163157fd7cab49ff4c0a12ddd
2020-04-13 00:48:10 +00:00
TreeHugger Robot
545f08e872 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev 2020-04-13 00:28:11 +00:00
Robert Luo
afb01f12cd Fix NFC UI is not available when switching to 2nd user
Bug: 152581438
Test: (1) make -j42 RunSettingsRoboTests (2) check NFC UI and function work as 2nd user
Change-Id: Ibf0346b992406c1d6329580083c1cd49180376cf
2020-04-12 15:27:18 +08:00
TreeHugger Robot
11ab1464c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: e7c0cff6a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I65d0dc38fc54ff8153f644ff57f41f0740654c5b
2020-04-11 23:18:49 +00:00
TreeHugger Robot
e7c0cff6a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours
am skip reason: subject contains skip directive

Change-Id: I0c8c5a3623151dea336dfae92932e6e769d43853
2020-04-11 23:00:39 +00:00
TreeHugger Robot
29b22263c5 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-11 22:43:33 +00:00
Bill Yi
0a7e821da3 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours am: e19e364142 -s ours
am skip reason: subject contains skip directive

Change-Id: I50388f6dbcc68d80fb6e95da50ba1857f2db09fb
2020-04-11 22:06:46 +00:00
Bill Yi
e19e364142 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours
am skip reason: subject contains skip directive

Change-Id: Ia6ba2667a8981b0a655bba90c23611d043d5a1a4
2020-04-11 21:43:50 +00:00
Bill Yi
e5a75d999f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I4b655b05c1ffe6c5ecd9878216dfbf50b173692c
2020-04-11 12:38:18 -07:00
Bill Yi
f4fdb7aa6f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ib326e867526a7b49d3134265abf3edc8293bb5f5
2020-04-11 12:06:30 -07:00
TreeHugger Robot
c341afd2d4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f95f9c9392 -s ours am: 8dcd33f953 -s ours
am skip reason: subject contains skip directive

Change-Id: Iebf486f51a6614dacb61680759ccd21111babbe5
2020-04-11 00:39:49 +00:00
TreeHugger Robot
8dcd33f953 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f95f9c9392 -s ours
am skip reason: subject contains skip directive

Change-Id: If9b7e8ccca82c08b4ccbeeddf23e2aaad3ef5e3e
2020-04-11 00:17:44 +00:00