Commit Graph

79279 Commits

Author SHA1 Message Date
Jiashen Wang
8cfa4c8c97 Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev 2021-02-01 23:56:37 +00:00
Tom Hsu
1a356f2425 [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours am: fd8531400d -s ours
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec3106b0896f60b5baa9dfb8c77e2ac7743257aa
2021-02-01 19:34:28 +00:00
Tom Hsu
fd8531400d [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I317d66aebf3fc45800a062cd34f9aa3f5eec90bf
2021-02-01 18:28:23 +00:00
Tom Hsu
62f6b96b51 Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1d85c7136b824e69077ea06c68d142a706c2b11
2021-02-01 18:00:38 +00:00
TreeHugger Robot
2250b7762c 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: I7cf6a8b2e96155f7a3c7f777f50aa2137da682ce
2021-02-01 17:41:46 +00:00
Tom Hsu
6ec886a0e3 Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev 2021-02-01 17:26:47 +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
928cdbaef9 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: I257f13d82f837235b6925e18db31f58893a831c0
2021-02-01 14:50:34 +00:00
Zoey Chen
d3e52096b9 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: Id8cad48f59825e15fe53c2f999ee482b543ea828
2021-02-01 14:50:04 +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
7a047f9433 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: I40771cab08cafd8f52f680e4125a25a1219ecaa1
2021-02-01 13:48:58 +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
Aaron Huang
3bb961affd Replace @hide API with public API
ProxyInfo is inculded in framework-connectivity module
which should not have external dependencies on its hidden API.
Thus, migrate getExclusionListAsString to getExclusionList.

Bug: 178777253
Test: build
Change-Id: I64b9d5be062bec43c7be3ea68d1f63054319df2d

Change-Id: I400df793fc669d0e574fb4cf022d021d99859d53
2021-02-01 19:16:23 +08: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
b506992d9f 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: I464d4c0b7c995952730b46f89ecb88b4ebb96e6b
2021-02-01 08:41:02 +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
25dafabb5c 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: I466f03b516523bf12bc5bf397a9556f1a54844ca
2021-02-01 08:16:05 +00:00
TreeHugger Robot
9847b9e46e 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: I5a427e0948a442a605ce154b92e78a7c93b83e79
2021-02-01 08:15:59 +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
0db17c1127 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: Ia2dcaaf55d5307faaa2cc4407fd0b01b5e1b3438
2021-02-01 06:35:53 +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
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
0c1ca756a0 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: I2092c10fd214188b6e5aeca34f05ad947ee32f9b
2021-02-01 04:44:36 +00:00
Bonian Chen
ca502c24b6 Merge "[Settings] Backup calling string change" into sc-dev 2021-02-01 04:16:24 +00:00
Manish Singh
3de2a09f93 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: If007574d2433b3900b0bf86e27471787b41259a5
2021-02-01 03:41:04 +00:00
Manish Singh
7a3f29ac14 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: Ic77b09af08698157143603c308cf2239b4f416e7
2021-02-01 03:40:53 +00:00
Weng Su
eaeb50271e [Security Report] Fix Settings WifiScanModeActivity Overlaid issue
- Disallowed non system overlay windows

- Screenshot
  https://screenshot.googleplex.com/77fJ9QN6pV4zFYc

Bug: 174047492
Test: manual test

Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5)
2021-02-01 03:34:01 +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
aca5d1e6d9 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: I859cb2037c7525571ac7f329d883cebb4d8bfc43
2021-02-01 03:10:37 +00:00
TreeHugger Robot
7b0563946e Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into sc-dev 2021-02-01 02:36:29 +00:00
Jiashen Wang
595884ed04 Change Settings to be able to receive timeout values from LPA
Bug: 171846124
Test: Tested manually
Change-Id: I547315eabd7cc873b0dda7a3bb2d09c84225ddd3
2021-01-31 21:38:28 +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
2dabed9356 [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: Ifff3e35bbdbb9423fb025a790d1e90e778f57289
2021-01-31 15:29:10 +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
Bill Yi
23bf2a585d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8865c08a85 -s ours am: ce7427560d -s ours am: 595a2506ad -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87791c03029211d7b638e60140672cae4fbe3dd0
2021-01-29 22:10:54 +00:00
Bill Yi
595a2506ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8865c08a85 -s ours am: ce7427560d -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If421934f759d082d085214a1963bdf9a7af61a00
2021-01-29 21:39:51 +00:00
TreeHugger Robot
c069c5b8e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: dce50f1f77 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b707e3947c134a2f64452a6dbaf88dfa213990c
2021-01-29 21:15:27 +00:00
TreeHugger Robot
103e8952c2 Merge "Rearrange System settings" into sc-dev am: b94db4b157
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13429147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa2f56882b716099da28faaf944a3abc460eb929
2021-01-29 21:11:22 +00:00
Jason Chiu
592c1055d0 Merge "Fix the suggestion button distortion" into sc-dev am: b178c547e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id79516d295ff97f6a890ebd934a4334112b1b89c
2021-01-29 21:01:49 +00:00
Jiun-Yang Hsu
a8954125d9 Merge "Initial commit for Settings component test" into sc-dev am: 0b1f51445c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9150e4fee5cbe901d5d708b49d0d94fffb74b5e
2021-01-29 21:01:43 +00:00
TreeHugger Robot
3900eda7ae Merge "Fix the background color of the homepage." into sc-dev am: a7c0036a8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432402

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ddddae4c62ae6d4767a60d0d5215098a5c788ab
2021-01-29 21:01:38 +00:00