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
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
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
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
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
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