Commit Graph

79159 Commits

Author SHA1 Message Date
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
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
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
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
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
TreeHugger Robot
94fb328182 Merge "Fix the transition of the up-button." into sc-dev am: 20fa1428bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b7d1eff6a9a97cbee2e587e553e0a0fb98b45d5
2021-01-29 21:01:34 +00:00
TreeHugger Robot
3cd7740b4b Merge "The UI is not immediately updated" into sc-dev am: e7515466ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1b2809f8dd0ba768f1b70384123206d2ef952ec
2021-01-29 21:01:29 +00:00
TreeHugger Robot
73048864be Merge "[Provider Model] Dynamically update the Internet Panel title" into sc-dev am: 097361797a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2630c1342c2d0d7084144e5ce643fc9ac6873da7
2021-01-29 21:01:17 +00:00
TreeHugger Robot
7bf50ea180 Merge "Hide esos setting if no app provides esos functionality" into sc-dev am: 16fa77369f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13428621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ffc0001a9dd84b91c70b5c722114fa187871f4b
2021-01-29 20:55:05 +00:00
Bill Yi
ce7427560d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8865c08a85 -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: Ic082f3c3eb9d0b8019e5684618193874bec23797
2021-01-29 20:41:29 +00:00
Manish Singh
29a6c26d80 Add Settings UI for MTP transcoding over USB.
Enabling "Transcode exported media" means that the media transferred
from the device via MTP over USB would be transcoded, if necessary. This
switch also sets / unsets the sys.fuse.transcode_mtp system property.

"Transcode exported media" category would be accessible only when the
"File transfer / Audio Auto" or "PTP" radio button has been selected. We
are including PTP also since PTP supports transfer of videos.

Adding UsbDetailsTranscodeMtpController in a separate preference
category than "Charge connected device" primarily because they seemed to
be different in their own rights.

Here are a few screenshots:
https://screenshot.googleplex.com/8jeMstnSFsTtVCS.png
https://screenshot.googleplex.com/76hNz4iXp5dcX4M.png
https://screenshot.googleplex.com/AkTngE5hDDJCovv.png
https://screenshot.googleplex.com/4uQYGXuuSQLoz3w.png

BUG: 158466651
Test: manual testing.  Also added unit test.
Change-Id: I2603a9bffed3320c193cc08f867bd67d9848da18
(cherry picked from commit 974662936e)
2021-01-29 20:22:05 +00:00
Tsung-Mao Fang
829c7b7b24 Remove a test case for fixing broken pesubmit
Change-Id: Iaa0477d22dc680d08b5d5614fec2c7eb3154465a
Fix: 178567560
Test: Run presubmit process
(cherry picked from commit cefdfc7bc9)
2021-01-29 20:21:04 +00:00
TreeHugger Robot
dce50f1f77 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-01-29 17:57:42 +00:00
TreeHugger Robot
b94db4b157 Merge "Rearrange System settings" into sc-dev 2021-01-29 14:06:58 +00:00
Jason Chiu
b178c547e4 Merge "Fix the suggestion button distortion" into sc-dev 2021-01-29 13:51:13 +00:00
Bill Yi
d4ee591cb3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1c9c1604346beda7019ed3378e6ddd751ae97c53
2021-01-29 05:34:23 -08:00