Commit Graph

79215 Commits

Author SHA1 Message Date
TreeHugger Robot
fbdfc8fcb0 Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev am: b40e5dc89d am: 953dc45f77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d691374d9ff85d56e9032bab1ece092ca1c56a0
2021-02-01 18:27:33 +00:00
TreeHugger Robot
953dc45f77 Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev am: b40e5dc89d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64e4d969380bb87315347a1ee5812039474da0c1
2021-02-01 18:01:24 +00:00
TreeHugger Robot
b40e5dc89d Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev 2021-02-01 17:00:04 +00:00
Tsung-Mao Fang
0942bf2582 Merge "Tweak the ui based on the Android S design" into sc-dev am: 77382001fa am: fdd8331363
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd7dfb3f5e3bf0f26f1b6c525ffa80256b9227a4
2021-02-01 15:19:40 +00:00
Zoey Chen
9657379d70 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev am: 68c2d0bdf6 am: 81941b9aa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf3c92e01b5445a8829d84daecf0929599d09281
2021-02-01 15:19:15 +00:00
Tsung-Mao Fang
fdd8331363 Merge "Tweak the ui based on the Android S design" into sc-dev am: 77382001fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic608677db8d11500f70940839b677c98ece6b230
2021-02-01 14:51:44 +00:00
Zoey Chen
81941b9aa3 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev am: 68c2d0bdf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0462678ce051c984784359b56da4f51269891898
2021-02-01 14:51:28 +00:00
Tsung-Mao Fang
77382001fa Merge "Tweak the ui based on the Android S design" into sc-dev 2021-02-01 14:39:04 +00:00
Weng Su
5cf4cf2660 [Provider Model] Fix InternetPreferenceControllerTest failed issue.
- Bypass system resource

Bug: 179016907
Test: manual test
- atest InternetPreferenceControllerTest
Change-Id: I860eb3173f112a7d3f820701afb1a96a06d4a296
2021-02-01 14:37:38 +00:00
Zoey Chen
68c2d0bdf6 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev 2021-02-01 14:10:29 +00:00
Zoey Chen
29dd5f9ec3 Merge "[Provider Model] Update the preferred status to the latest" into sc-dev am: 28f3a570f7 am: 39dbfb91bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1999858a985b1ae59732e7320fd3739833a1a37a
2021-02-01 14:05:26 +00:00
Zoey Chen
39dbfb91bd Merge "[Provider Model] Update the preferred status to the latest" into sc-dev am: 28f3a570f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7d832333fefd71e4f6c07727e5efddc57134dc5
2021-02-01 13:49:10 +00:00
Zoey Chen
28f3a570f7 Merge "[Provider Model] Update the preferred status to the latest" into sc-dev 2021-02-01 13:18:59 +00:00
Tsung-Mao Fang
23e77a557a Tweak the ui based on the Android S design
- Use TopIntro preference to show introduction text

Change-Id: Ic2304dab188848dfa6ef8a0429fd5b7ad40cf0af
Test: See the screenshot- https://screenshot.googleplex.com/AMS64EGe5Fcdfn8
Fix: 177997785
2021-02-01 20:46:43 +08:00
Jeremy Goldman
ea8e384dcd Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev am: ba8f1ad06f am: f9682d67f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448948

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2d5fabe09e95eadacd05f2a2fd932e4a8d5e05f
2021-02-01 09:17:40 +00:00
TreeHugger Robot
2ae912cf00 Merge "Update Mobile Settings Dialog theme to adopt Dark theme" into sc-dev am: b1b0f450e7 am: e0a5aadbc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I491d044a74381d73450aa8214f05003f5f9ee9ab
2021-02-01 09:17:34 +00:00
TreeHugger Robot
25250d48e3 Merge "The wifi list is not null at no signal room" into sc-dev am: 3cdb93cbf9 am: 696d722216
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7fa6236ba4608d5ea5a4e9c3ddf2c9c1caa9028
2021-02-01 09:17:10 +00:00
Zoey Chen
4f05555f4f [Provider Model] Add Learn more in the WFC footer
UX deck: https://screenshot.googleplex.com/4DxGCxgEsujhEpy.png
Implementation: https://screenshot.googleplex.com/5yZhQMQwwRZQkge.png

Bug: 178898044
Test: make
Change-Id: Icfde927e6781303b6016b0ec13201fd7052191d3
2021-02-01 16:57:57 +08:00
Jeremy Goldman
f9682d67f5 Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev am: ba8f1ad06f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448948

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e4c45765397b2d033117f02e40a72e41f2ae08b
2021-02-01 08:17:34 +00:00
TreeHugger Robot
e0a5aadbc9 Merge "Update Mobile Settings Dialog theme to adopt Dark theme" into sc-dev am: b1b0f450e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id502b5d654c27851158529bf87a146e5b027be44
2021-02-01 08:17:26 +00:00
TreeHugger Robot
696d722216 Merge "The wifi list is not null at no signal room" into sc-dev am: 3cdb93cbf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I977938da8047b9baaad118cbe74c7ea1761346d6
2021-02-01 08:17:12 +00:00
Jeremy Goldman
ba8f1ad06f Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev 2021-02-01 08:16:42 +00:00
TreeHugger Robot
b1b0f450e7 Merge "Update Mobile Settings Dialog theme to adopt Dark theme" into sc-dev 2021-02-01 08:00:17 +00:00
Zoey Chen
9b2c37db9c [Provider Model] Update the preferred status to the latest
Bug: 178916743
Test: make
Change-Id: I223c3a2e8481fd1b887ef9e2d200906d12c7eec5
2021-02-01 15:53:21 +08:00
TreeHugger Robot
3cdb93cbf9 Merge "The wifi list is not null at no signal room" into sc-dev 2021-02-01 07:53:18 +00:00
Weng Su
65bab8d5f8 Merge "[Provider Model] Fix Internet preference crash" into sc-dev am: 548569e3eb am: 52394b4245
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425304

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1ebca917ca4657bf72a0e3698723d8bae1d9610
2021-02-01 07:29:50 +00:00
Weng Su
52394b4245 Merge "[Provider Model] Fix Internet preference crash" into sc-dev am: 548569e3eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425304

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7966fa1c153b72fa9b680ee017a243f987126e5
2021-02-01 06:39:02 +00:00
Weng Su
548569e3eb Merge "[Provider Model] Fix Internet preference crash" into sc-dev 2021-02-01 06:12:11 +00:00
SongFerngWang
705f1df886 The wifi list is not null at no signal room
- check the wifi list's size for error message.
- fix the carrier's summary display "connect" at no signal room

Bug: 177390298
Test: atest ProviderModelSliceHelperTest
atest ProviderModelSliceTest

Change-Id: I692aadd01a290cce2438b0d3c084bef8d8d3fa24
2021-02-01 13:58:49 +08:00
Bonian Chen
f2b3767626 Merge "[Settings] Backup calling string change" into sc-dev am: ca502c24b6 am: fe31561801
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13437249

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I058c83afabebf8a54407b0bbdcb945e5fd3d8d0d
2021-02-01 05:04:22 +00:00
Jeremy Goldman
b3fc7e5b10 Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." 2021-02-01 05:03:30 +00:00
Jeremy Goldman
3dd2878437 SubscriptionUtil checks that SubscriptionInfo is null before accessing.
Test: atest -c SubscriptionUtilTest
Bug: 178707680
Change-Id: I03938405929c3307460107671bbe695ee5e0f6e9
2021-02-01 05:01:49 +00:00
Bonian Chen
fe31561801 Merge "[Settings] Backup calling string change" into sc-dev am: ca502c24b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13437249

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b60541992065ffb0a98060a0d639bffe1345326
2021-02-01 04:45:11 +00:00
Bonian Chen
ca502c24b6 Merge "[Settings] Backup calling string change" into sc-dev 2021-02-01 04:16:24 +00:00
Manish Singh
98cbbc2348 Merge "Add Settings UI for MTP transcoding over USB." into sc-dev am: becac249e3 am: 16912c1544
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13435373

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91055d48d82f2d96883e9c458857072d9f9cdd0e
2021-02-01 03:30:13 +00:00
Manish Singh
d50632264a Merge "Remove a test case for fixing broken pesubmit" into sc-dev am: fefb8aa970 am: d6a8f92e57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13437476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62f1e6cc200b0e633ebe5ed4653f5fa314d40140
2021-02-01 03:30:08 +00:00
TreeHugger Robot
1e5f36106c Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into sc-dev am: 7b0563946e am: 0fa4f7b2a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I526dfa0b9f3d64d935dcf45ac232bcb350de02f6
2021-02-01 03:29:33 +00:00
Manish Singh
16912c1544 Merge "Add Settings UI for MTP transcoding over USB." into sc-dev am: becac249e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13435373

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8ff96979f01d4cdd8f3a881750eca56941d414c
2021-02-01 03:22:01 +00:00
Manish Singh
d6a8f92e57 Merge "Remove a test case for fixing broken pesubmit" into sc-dev am: fefb8aa970
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13437476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48b95687bbc976ea479b18e27aef6fe1484f84d4
2021-02-01 03:21:54 +00:00
Manish Singh
becac249e3 Merge "Add Settings UI for MTP transcoding over USB." into sc-dev 2021-02-01 03:17:29 +00:00
Manish Singh
fefb8aa970 Merge "Remove a test case for fixing broken pesubmit" into sc-dev 2021-02-01 03:17:18 +00:00
TreeHugger Robot
0fa4f7b2a0 Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into sc-dev am: 7b0563946e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d6f23f1d59be9487539fc8fd0149c8a9dc8524f
2021-02-01 03:11:33 +00:00
Jeremy Goldman
daf7550a86 SubscriptionUtil checks that SubscriptionInfo is null before accessing.
Test: atest -c SubscriptionUtilTest
Bug: 178707680
Change-Id: I03938405929c3307460107671bbe695ee5e0f6e9
2021-02-01 10:45:18 +08:00
TreeHugger Robot
7b0563946e Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into sc-dev 2021-02-01 02:36:29 +00:00
Jiun-Yang Hsu
803a6cd9c5 [automerger skipped] Merge "Create folder and OWNERS file for component test" am: cf231cad93 am: 1e2386b14b am: 5da8b8b933 -s ours am: 06abd14274 am: 825b6e249f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc93e4fb7afd15b2d1680ac54759e6fa9ca8d60d
2021-01-31 15:52:18 +00:00
Bonian Chen
fb9450a172 [Settings] Backup calling string change
Change on wordings based on suggestion.

Bug: 178117374
Change-Id: I834ae66a112a3ed4074282db84107ee5a386ccf8
Test: on device
2021-01-31 15:51:06 +00:00
Jiun-Yang Hsu
825b6e249f [automerger skipped] Merge "Create folder and OWNERS file for component test" am: cf231cad93 am: 1e2386b14b am: 5da8b8b933 -s ours am: 06abd14274
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3bdc007133cf806e6636a1e26a72cfda8aed1ea
2021-01-31 15:30:31 +00:00
Jiun-Yang Hsu
06abd14274 [automerger skipped] Merge "Create folder and OWNERS file for component test" am: cf231cad93 am: 1e2386b14b am: 5da8b8b933 -s ours
am skip reason: skipped by user jyhsu

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I136d775f0fc66d271c9a10671f03b294c4dfa254
2021-01-31 14:23:37 +00:00
Jiun-Yang Hsu
5da8b8b933 Merge "Create folder and OWNERS file for component test" am: cf231cad93 am: 1e2386b14b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8474a2ec62e212d932865419b866c42c2fbd8826
2021-01-29 23:43:05 +00:00
Jiun-Yang Hsu
1e2386b14b Merge "Create folder and OWNERS file for component test" am: cf231cad93
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60949e540697933fb138ab9d42d28657474cf136
2021-01-29 23:21:55 +00:00