Jiashen Wang
e6da71456f
Merge "Slot Change Receiver Migration" into sc-dev am: 428273765b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13411837
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb64c4ec83ccafb0f04d2554b791f5ab6bd2047b
2021-02-02 00:54:50 +00:00
Jiashen Wang
966973f422
Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev am: 8cfa4c8c97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13431258
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id66f32bc60a016ec2d31a632e68076b5248ea68f
2021-02-02 00:09:25 +00:00
Jiashen Wang
428273765b
Merge "Slot Change Receiver Migration" into sc-dev
2021-02-01 23:57:09 +00:00
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
58e6563250
[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: I43e7917951351bcf7ebe868f1a044a663d8dfaed
2021-02-01 19:36:45 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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