Alexander Dorokhine
6decca7890
Migrate away from deprecated Truth APIs.
...
This is a transitional step towards truth 1.0.1, where these APIs have
been completely removed.
Bug: 168765701
Test: m checkbuild
Merged-In: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
Change-Id: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
(cherry picked from commit 46e85a2fad
)
2020-10-06 00:25:04 -07:00
TreeHugger Robot
fafe12056c
Merge "Hide tethering option when in a guest account" into rvc-qpr-dev am: ab41be5607
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12723406
Change-Id: I4caa8937deae9bc104c9c6c3446b7f793cac1f80
2020-10-06 02:25:09 +00:00
TreeHugger Robot
ab41be5607
Merge "Hide tethering option when in a guest account" into rvc-qpr-dev
2020-10-06 02:06:23 +00:00
Bill Yi
45eb63a024
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ea96cf6db
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12762076
Change-Id: Ie0a71db474d15bf39badbe81c177db78f2e4cb7b
2020-10-05 05:14:57 +00:00
Bill Yi
7ea96cf6db
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8bcf35d1b5eae3e56f485fa78ade8eea9ecb2deb
2020-10-04 21:51:40 +00:00
Treehugger Robot
159de41477
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
am: fc6cb188b5
am: be8b195fe1
am: 2f068a914e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809
Change-Id: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
2020-09-29 06:18:19 +00:00
Treehugger Robot
2f068a914e
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
am: fc6cb188b5
am: be8b195fe1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809
Change-Id: I63d1925ed0bb4347098b926e27dcd4b8887421a4
2020-09-29 06:04:54 +00:00
Treehugger Robot
c0dbafc438
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea
am: b4093123de
am: e13fa41a29
am: 722f9f4ea8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565
Change-Id: I3f2fb62790ba30914d1b7a5555809954066e0455
2020-09-29 05:29:52 +00:00
Treehugger Robot
580963266b
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
am: e0890849cd
am: 000159f6db
am: 6513978872
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: Ia6cbd95f410a4763b5a4a066b942e1fcd44b0fb1
2020-09-29 05:29:43 +00:00
Treehugger Robot
4d513437aa
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
am: e570e80eb8
am: 24dc71f7e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I7ded23298875715dec1a48d9364a174639b7f92b
2020-09-29 05:29:33 +00:00
Treehugger Robot
be8b195fe1
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
am: fc6cb188b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809
Change-Id: I844668256cf7b87f6dc29272e3d01c7c51b813e5
2020-09-29 05:29:24 +00:00
Treehugger Robot
6ace0ecdde
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
am: 5f81bb9a07
am: bb98b793e5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ieb22f4b036c3a569acdf9ea4451fba7b5d7a9851
2020-09-29 05:29:21 +00:00
Treehugger Robot
7b7382fdf2
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
am: 7c9cc5621b
am: 7f3bbcddf0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: Ia130edabc0cb44a787ef107641e39ead544d81af
2020-09-29 05:29:07 +00:00
Treehugger Robot
722f9f4ea8
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea
am: b4093123de
am: e13fa41a29
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565
Change-Id: If21308e7f0e67eb39c791206f1e0ee05697b54e8
2020-09-29 05:14:28 +00:00
Treehugger Robot
6513978872
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
am: e0890849cd
am: 000159f6db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: I9e08c98c28e15bc5833d4c23e569a83840d40172
2020-09-29 05:14:19 +00:00
Treehugger Robot
24dc71f7e8
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
am: e570e80eb8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I3bf65953a9751b8cfd9dab666f5b1ad400bbdd36
2020-09-29 05:14:11 +00:00
Treehugger Robot
bb98b793e5
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
am: 5f81bb9a07
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ic774e63dd14139999e96210bc89476edc095e02b
2020-09-29 05:14:03 +00:00
Treehugger Robot
7f3bbcddf0
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
am: 7c9cc5621b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: I4397688b601c1a8bd53ce49b5ec6db16eff9db5a
2020-09-29 05:13:51 +00:00
Treehugger Robot
fc6cb188b5
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809
Change-Id: I8342d2c6813115f9705ca2e5ef201125ea0f9576
2020-09-29 05:13:43 +00:00
Treehugger Robot
177533ddbb
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest"
2020-09-29 05:03:06 +00:00
Treehugger Robot
e13fa41a29
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea
am: b4093123de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565
Change-Id: I9af0af7bbb19cfb1c7337960dc83fbc8e59eeab4
2020-09-29 05:00:53 +00:00
Treehugger Robot
000159f6db
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
am: e0890849cd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: I88eeb86872e17fa03385dad601ed5e11f9b176d7
2020-09-29 05:00:44 +00:00
Treehugger Robot
e570e80eb8
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: Ieb5efa13b99875a9177016ec90faadd5e2d17f67
2020-09-29 05:00:35 +00:00
Treehugger Robot
5f81bb9a07
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: If991989404484407853bd8ac42430761d1e37018
2020-09-29 05:00:26 +00:00
Treehugger Robot
7c9cc5621b
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: I716f8a88d3d6a6022d679736bb278d3f9eb638bb
2020-09-29 05:00:12 +00:00
Treehugger Robot
b4093123de
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565
Change-Id: Icf8adbe951a8ac435cf3b035bab59508f5f48d0e
2020-09-29 04:46:44 +00:00
Treehugger Robot
e0890849cd
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: Ie004598ea8d432d931a54469c1229e1b215ea759
2020-09-29 04:46:30 +00:00
Treehugger Robot
8c58bd4520
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I8de47f938f94b000ba4274b3b4ef2ec77181b0e5
2020-09-29 04:46:15 +00:00
Treehugger Robot
27978c5d47
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ia304c487a41b82f67d51542b09585b52c64ab94c
2020-09-29 04:45:57 +00:00
Treehugger Robot
48c399c18a
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: If68a407eac5837b85781ae4eb20c4bfad1436700
2020-09-29 04:45:22 +00:00
Treehugger Robot
93cec35cea
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest"
2020-09-29 04:33:23 +00:00
Treehugger Robot
27806fde5e
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest"
2020-09-29 04:30:56 +00:00
Treehugger Robot
1cd8904fc5
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest"
2020-09-29 04:29:55 +00:00
Treehugger Robot
3eeb8b44c2
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest"
2020-09-29 04:28:34 +00:00
Treehugger Robot
71c667322c
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest"
2020-09-29 04:27:45 +00:00
Hugh Chen
a50f020c85
Hide tethering option when in a guest account
...
- Before this CL, users can share their mobile data through enabling
tethering in the USB menu when in a guest account.
It will cause main users to spend their money unexpectedly.
This CL will hide the tethering option on the USB menu when in the
guest account.
- Add test cases.
Bug: 166125765
Test: 1. make -j42 RunSettingsRoboTests. 2. Switch to a guest account
to verify whether the tethering option is hiding.
Change-Id: I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe
Merged-In: I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe
(cherry picked from commit bde627b263
)
2020-09-29 01:57:37 +00:00
TreeHugger Robot
04b4da5220
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ce61ea1506
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715230
Change-Id: I2e8686ba34a3d3180aed6f6830c414846911f9b8
2020-09-28 15:30:31 +00:00
Bill Yi
0bac679d7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2aaa31892e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715231
Change-Id: Ib5b87107c39e7b10d3a13374906396e9e7bfa129
2020-09-28 15:30:24 +00:00
TreeHugger Robot
ce61ea1506
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-09-28 15:21:51 +00:00
Bill Yi
2aaa31892e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8b5b9411c949934d99bea34b0292d8e5de512413
2020-09-28 00:45:38 -07:00
Bill Yi
1bc5c2a1ed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic754186b5e7ee18485a2d441b10965d768072e24
2020-09-27 23:59:31 -07:00
Treehugger Robot
da6ffe3636
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
am: 423f9801e9
am: 2532a70ba1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I89308bbe2a0305f1d2a1a06da9f936e21c8bf6cd
2020-09-28 03:07:24 +00:00
Treehugger Robot
2532a70ba1
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
am: 423f9801e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: Ibc85aecd1c5a83e67970fd9daf381e1da3f35bf2
2020-09-28 02:53:19 +00:00
Treehugger Robot
423f9801e9
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: Ibaaf851ae4b9b486b83b795aa9818413cd0f14bf
2020-09-28 02:25:26 +00:00
Treehugger Robot
6891dd4590
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I82d1bcd87109666b5b74e8d74811f423ae33105e
2020-09-28 02:12:11 +00:00
Treehugger Robot
7f6271364b
Merge "Avoid unexpected state changes for enhanced preferences"
2020-09-28 02:01:05 +00:00
Tyler Gunn
ce636284ec
Fix issue where "learn more" link on 5G NR settings doesn't work. am: d3d88afee7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12700756
Change-Id: I64aae8431da809ce109d68a0663c6c663235693e
2020-09-25 21:54:18 +00:00
Tyler Gunn
d3d88afee7
Fix issue where "learn more" link on 5G NR settings doesn't work.
...
Issue is due to the fact the footer text is a spannable string which
although different from the original text loaded when the preference
was constructed, is the same in terms of object equality.
Clearing the preference title before assigning the footer text fixes this.
Fixes: 162011372
Test: Manual test; open settings and verify link is clickable now.
Merged-In: I5d22c665b0d6fb842bc54dc55a2eb3045e0092a2
Change-Id: I5d22c665b0d6fb842bc54dc55a2eb3045e0092a2
(cherry picked from commit 97d8711d84
)
Exempt-From-Owner-Approval: Straight cherry-pick.
2020-09-25 21:18:29 +00:00
TreeHugger Robot
f6bcf2334e
Merge "[adbwifi] wireless debugging qstile long-press to WirelessDebuggingFragment." into rvc-qpr-dev am: 39baa4a821
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12654737
Change-Id: I64e85bea61395c43b57521c2ad4463b27b432468
2020-09-25 16:27:50 +00:00
TreeHugger Robot
39baa4a821
Merge "[adbwifi] wireless debugging qstile long-press to WirelessDebuggingFragment." into rvc-qpr-dev
2020-09-25 15:55:55 +00:00