Jeremy Goldman
b3fc7e5b10
Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing."
2021-02-01 05:03:30 +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
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
Bill Yi
c92a193faf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8865c08a85
-s ours am: ce7427560d
-s ours am: 595a2506ad
-s ours am: 5c215aeab1
-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: I3d9c0e600618b32172b5a508b13f29aa7b1c94f4
2021-01-29 23:11:49 +00:00
Bill Yi
5c215aeab1
[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: I76201cf2bc5c77ca098ea2e76cdfde8b31bad406
2021-01-29 22:20:58 +00:00
TreeHugger Robot
fec56cb5c9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: dce50f1f77
-s ours am: 8306f3509d
-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: I78bce5fb339b6102715f1de41c0189cc254e3833
2021-01-29 21:42:09 +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
8306f3509d
[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: Id0f02e1afece08bfc89d81dba8b49f588a7fa6a7
2021-01-29 21:13:13 +00:00
TreeHugger Robot
5d1ada1af0
Merge "Rearrange System settings" into sc-dev am: b94db4b157
am: d70ee0b66e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13429147
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I54d9c8dd4a82532c967d69321b84d9376b30b049
2021-01-29 21:11:15 +00:00
Jason Chiu
06eba6fa5d
Merge "Fix the suggestion button distortion" into sc-dev am: b178c547e4
am: 15bbb0c023
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432391
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0dc1723a739cad2c14d4037e5aadf6876c6593c6
2021-01-29 21:11:08 +00:00
Jiun-Yang Hsu
e89d446095
Merge "Initial commit for Settings component test" into sc-dev am: 0b1f51445c
am: 6b0e7b6d8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72665d856b321eecae831634a25ec726e3f76819
2021-01-29 21:11:03 +00:00
TreeHugger Robot
9ce407e7ec
Merge "Fix the background color of the homepage." into sc-dev am: a7c0036a8c
am: f719f0ad02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432402
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I40ad6c16b09edcfd59b488e9fce679204b5c454e
2021-01-29 21:10:58 +00:00
TreeHugger Robot
19a5d6c31c
Merge "Fix the transition of the up-button." into sc-dev am: 20fa1428bc
am: 228bb300c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432390
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73eb15432bf29538bb679ff2505ff7c629acd823
2021-01-29 21:10:52 +00:00
TreeHugger Robot
37567bd64b
[automerger skipped] Merge "The UI is not immediately updated" into sc-dev am: e7515466ea
am: 31479278ad
-s ours
...
am skip reason: Change-Id I692209035332bfd463537988f4e3ce166414031e with SHA-1 59958e663d
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432396
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied8fb56d003fcdcc26abaa61a2d34d7ee4a9e770
2021-01-29 21:10:30 +00:00
TreeHugger Robot
cd0dc43bc6
Merge "[Provider Model] Dynamically update the Internet Panel title" into sc-dev am: 097361797a
am: 395203a5e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425388
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3743842bc7f068a1028cb5a6fbd529a5c7a11212
2021-01-29 21:10:23 +00:00
TreeHugger Robot
870705c66b
Merge "Hide esos setting if no app provides esos functionality" into sc-dev am: 16fa77369f
am: 3042a14e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13428621
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1a6532df8fb04e07037cffb110fc0cfbb44a023
2021-01-29 21:10:14 +00:00
TreeHugger Robot
d70ee0b66e
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: If3fd7aa81ab39913a60971fb17f89a3ea3663bac
2021-01-29 20:45:33 +00:00
Jason Chiu
15bbb0c023
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: Ied73c28a410cb4387bde0f8a9fdb233cdc862add
2021-01-29 20:45:18 +00:00
Jiun-Yang Hsu
6b0e7b6d8c
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: I9565b86df8d1d8f2aa93580e71e5522a0d0714e3
2021-01-29 20:45:11 +00:00
TreeHugger Robot
f719f0ad02
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: I4011dff2e95a0d407ec3149d4a9ec3194b51e02a
2021-01-29 20:45:01 +00:00
TreeHugger Robot
228bb300c8
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: Id09a774dcf7bed2d78cf7588a74f85783c85fdd8
2021-01-29 20:44:52 +00:00
TreeHugger Robot
31479278ad
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: I60ca79bba8b6c096d033311f51188271566f9788
2021-01-29 20:44:44 +00:00
TreeHugger Robot
395203a5e3
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: Idd74e0ea6f5dabf48e8d2f3911d02d1199b491a0
2021-01-29 20:44:29 +00:00
TreeHugger Robot
3042a14e5a
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: I72fbe5e7620c0ffd7f877e342c3ed026273ef944
2021-01-29 20:43:31 +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
00ec22c3f8
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-29 18:15:55 +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
Jiun-Yang Hsu
0b1f51445c
Merge "Initial commit for Settings component test" into sc-dev
2021-01-29 12:55:02 +00:00
Jiun-Yang Hsu
cf231cad93
Merge "Create folder and OWNERS file for component test"
2021-01-29 12:48:32 +00:00
Edgar Wang
bd0dd5d886
Rearrange System settings
...
- Fork system_dashboard_fragment_v2 for dev.
- Reorder the preference
- Remove summary
Bug: 174965365
Test: manual & robotest
Change-Id: Icc994f3b2e38ad54958deb5c9f80b6cd085029f0
2021-01-29 12:10:58 +00:00
Bill Yi
b2c4636bba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib85884361ce08afbc06459f15d9ed6d852708f61
2021-01-29 03:57:07 -08:00
TreeHugger Robot
a7c0036a8c
Merge "Fix the background color of the homepage." into sc-dev
2021-01-29 10:57:16 +00:00