TreeHugger Robot
f18fa186e9
Merge "Move the additional settings to the top of AppInfoDashboard" into sc-dev am: 9a33929b45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451724
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88e8a5631f0c580ddad86d16f2f2a0957e379b5d
2021-02-03 01:12:04 +00:00
TreeHugger Robot
9a33929b45
Merge "Move the additional settings to the top of AppInfoDashboard" into sc-dev
2021-02-03 01:06:35 +00:00
Jiashen Wang
61f68f1dde
Merge "Fix ANR issue for SimSlotChangeReceiver" into sc-dev am: 1125a7600f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13459631
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If389d852205609d455e6ad505b08099c26ff72b5
2021-02-03 00:46:25 +00:00
Jiashen Wang
1125a7600f
Merge "Fix ANR issue for SimSlotChangeReceiver" into sc-dev
2021-02-03 00:31:48 +00:00
Yi Jiang
fcda9ef314
Merge "Makes screen attention unsearchable on the devices that don't have the feature" into sc-dev am: e47e8ec5dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13460155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff5cbf2aeabf04b4e853ca2c36070687a4ed26e8
2021-02-02 23:16:48 +00:00
Yi Jiang
e47e8ec5dd
Merge "Makes screen attention unsearchable on the devices that don't have the feature" into sc-dev
2021-02-02 22:29:54 +00:00
Yi Jiang
77647ea977
Makes screen attention unsearchable on the devices that don't have the feature
...
Bug: 178866004
Test: make RunSettingsRoboTests
Change-Id: I8881f6b87be73b2ff75e7dfe294d2dbb75ff73d4
2021-02-02 11:55:10 -08:00
Jiashen Wang
1ef16831b6
Fix ANR issue for SimSlotChangeReceiver
...
Bug: 179109464
Test: Manually tested
Change-Id: Ibcb5eb57cdb5a238f9e49945fea3da20b2ffb2ab
2021-02-02 11:23:13 -08:00
Stanley Wang
4a1954592a
Use MainSwitchPreference to replace the button style switches. am: 10b7a7d483
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia127d0eb8c774ba01c03c8a5d7bb7edd0ab9272a
2021-02-02 13:00:01 +00:00
Yanting Yang
a599dbcc84
Move the additional settings to the top of AppInfoDashboard
...
Based on the Android S design, move additional settings preference
above the Notifications preference and use SpacePreference to draw
the horizontal divider below AppButtonsPreference since the additional
settings preference is only visible by condition.
Also remove initialExpandedChildrenCount to expose all preferences.
Bug: 174964524
Test: robotest & visual with turning on/off silky home
Change-Id: Ife1d37820e44f8e12af4ed37ed66a29281366b50
2021-02-02 16:58:08 +08:00
Stanley Wang
10b7a7d483
Use MainSwitchPreference to replace the button style switches.
...
Fix: 177967926
Fix: 177968295
Fix: 177967925
Fix: 177968078
Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Ie854de96e5495fa564fb8a097ed4547bbd2b10c5
2021-02-02 08:39:37 +00:00
Wilson Wu
5aaf550781
Merge "Apply ResultCallback to DevelopmentTiles" into sc-dev am: 70864998c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425387
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I400e4990880d05f54c335cbf40e5622403682de0
2021-02-02 08:09:36 +00:00
Wilson Wu
70864998c4
Merge "Apply ResultCallback to DevelopmentTiles" into sc-dev
2021-02-02 07:35:56 +00:00
Wesley.CW Wang
e79da0b12b
Update battery saver column to PrimarySwitchPreference (1/2) am: 8d9fe815b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413813
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4fad863e34ab5fa974a19eb07b575523b53d7421
2021-02-02 06:38:07 +00:00
Wesley.CW Wang
8d9fe815b0
Update battery saver column to PrimarySwitchPreference (1/2)
...
- Change battery saver entry column to new design
Screenshot: https://screenshot.googleplex.com/9a9Gxm3McJVmLkD.png
Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: I513bc4371518645f4e725df27f2cb978cec284e8
2021-02-02 06:13:08 +00:00
Jiashen Wang
cd2b9b16c6
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: I32b1e440072315b639756ccc9694c3d4b391b4d1
2021-02-02 00:53:24 +00:00
Jiashen Wang
ca43233c6c
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: Ib2d018e1ba0d8a6e1526c92b59e85dccd663d286
2021-02-02 00:07:45 +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
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
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