TreeHugger Robot
784223d0e3
[automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d
am: 8c799744a3
-s ours
...
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723689
Change-Id: I069905bbf4d459eddb22c845bbb8f4a766e00a7f
2021-12-22 03:18:14 +00:00
TreeHugger Robot
8c799744a3
Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723689
Change-Id: I0b2458d050882d10c7aa6820e762f69612bf5004
2021-12-22 03:01:12 +00:00
TreeHugger Robot
da8ab6a51d
Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev
2021-12-22 02:43:04 +00:00
SongFerng Wang
fdfb0bcf44
Merge changes I5c6ad4b3,Icb00b3fc
...
* changes:
[MEP] renew the default data selection UI
[MEP] renew the sim confirm dialog UI
2021-12-21 15:53:21 +00:00
Jan Tomljanovic
14bbac9424
Merge "Redirect intents leading to Security and Privacy pages"
2021-12-21 10:44:36 +00:00
SongFerngWang
be8f279f2c
[MEP] renew the default data selection UI
...
- renew the default Data/Call/SMS selection
Bug: 199902896
Test: build pass and local UI test
Change-Id: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
2021-12-21 16:34:30 +08:00
TreeHugger Robot
4ae3127eaf
Merge "[Settings] Workaround for network and internet crash"
2021-12-21 08:20:18 +00:00
Xin Li
70f342d7fb
[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3
am: 3be43ae165
-s ours am: 45c581df53
-s ours am: bf2e17f4b9
-s ours
...
am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705
Change-Id: Ie9a257778489a39e27ef3ed36d23f4fd2b266e53
2021-12-21 07:50:11 +00:00
Xin Li
bf2e17f4b9
[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3
am: 3be43ae165
-s ours am: 45c581df53
-s ours
...
am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705
Change-Id: I664100f166a7dadf818f19c71f0c9cd593a8f757
2021-12-21 07:36:38 +00:00
Xin Li
45c581df53
[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3
am: 3be43ae165
-s ours
...
am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705
Change-Id: I6fc2e4a1c103c7efad592eb468a441795c267e07
2021-12-21 07:20:47 +00:00
Xin Li
3be43ae165
Merge "Merge SP1A.211205.008" am: 0bf1802bb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705
Change-Id: I8ce5af67e19d864ad3951c15252b0c3496fd56d0
2021-12-21 05:21:38 +00:00
Xin Li
0bf1802bb3
Merge "Merge SP1A.211205.008"
2021-12-21 05:02:44 +00:00
SongFerngWang
4780be49f3
[MEP] renew the sim confirm dialog UI
...
- renew the sim confirm dialog
Bug: 199902896
Test: build pass and local UI test
Change-Id: Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20
2021-12-21 12:51:16 +08:00
Tom Hsu
75b382f80e
Merge "[Panlingual] Add outside entry."
2021-12-21 03:23:06 +00:00
Bonian Chen
1b64e2bfcd
[Settings] Workaround for network and internet crash
...
Network and internet UI crash.
This is a temporarily workaround for it.
Bug: 211045208
Test: local
Change-Id: Ie19e565547c26967d83b194c2e098286dd676178
2021-12-21 09:48:51 +08:00
Xin Li
971abb190b
Merge SP1A.211205.008
...
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
2021-12-20 14:15:09 -08:00
Pavel Grafov
e2f4baed0b
Merge "Let Settings query per-admin policies"
2021-12-20 15:57:57 +00:00
tom hsu
26b0bd7f19
[Panlingual] Add outside entry.
...
- video: https://screencast.googleplex.com/cast/NjIxODkzNzYyMjU5MzUzNnwwMWMxYjI1Ny1hMw
Bug: 207743479
Test: local
Change-Id: Iab3ba4d14f581aed7b737521ccba4f62e1c04998
2021-12-20 19:37:59 +08:00
TreeHugger Robot
d0f1724cbb
Merge "Move vibrate for calls setting to "Vibration & haptics" screen"
2021-12-20 11:26:34 +00:00
Zoey Chen
4d365799d1
Merge "[Settings] Remove MobileNetworkActivity"
2021-12-20 05:03:36 +00:00
Treehugger Robot
e284e2b311
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
am: 9c2293ca92
am: 9713bec956
am: ae62873812
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621
Change-Id: I6d612fabfa85d826c40185c275c89439e4b08371
2021-12-20 04:02:01 +00:00
Treehugger Robot
ae62873812
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
am: 9c2293ca92
am: 9713bec956
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621
Change-Id: I2c7e0aeb425596f168a08f7c7bec653f5244e12e
2021-12-20 03:44:54 +00:00
Treehugger Robot
9713bec956
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
am: 9c2293ca92
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621
Change-Id: I8501963b7bd636b08107a1acd1495e74b355fea4
2021-12-20 03:31:28 +00:00
Treehugger Robot
9c2293ca92
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621
Change-Id: Ic05e38726cd2f42e919553a11eb0ce6944ce0d20
2021-12-20 03:14:04 +00:00
Treehugger Robot
a3d97ecd74
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing"
2021-12-20 02:53:33 +00:00
Alice Kuo
27a0274d6e
Add test case - forceUpdate_deviceIsSubDevice_doNothing
...
Bug: 201472540
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: I1aef6429b39109a09931a94b61f15e9470de3854
2021-12-20 01:35:40 +00:00
Yasin Kilicdere
1511407370
Merge changes from topics "addSettingsEntrypointToAddASupervisedUser", "simple fallback activity for supervised user creation"
...
* changes:
Create a simple fallback activity for supervised user creation
Add settings entrypoint to add a supervised user
2021-12-16 19:45:25 +00:00
Bonian Chen
9c56703a49
[Settings] Enable WiFi calling toggle in search am: a93796f7a3
am: c66bc49fde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16486544
Change-Id: I2a14bb83b0bd204f08a636bd80de33bf2d588343
2021-12-16 18:48:56 +00:00
Bonian Chen
c66bc49fde
[Settings] Enable WiFi calling toggle in search am: a93796f7a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16486544
Change-Id: I4977409c4016ab4eb40806a139a5870c425e9f19
2021-12-16 18:33:46 +00:00
Pavel Grafov
8d4e89bc8b
Let Settings query per-admin policies
...
Strictly speaking Settings is running under system uid,
so it won't fail without it, but adding for consistency.
Bug: 204995407
Test: builds
Change-Id: I9cdcb9aa9dd2f65ff6190e0335edada6e04477a9
2021-12-16 17:15:02 +00:00
Ronish Kalia
b9e599fd7c
Merge "Replace QR Code Scanner's setting strings"
2021-12-16 16:44:36 +00:00
TreeHugger Robot
4e2f2468ce
Merge "Remove unncessary constraintlayout-solver deps"
2021-12-16 15:11:54 +00:00
ronish
1b4907ef21
Replace QR Code Scanner's setting strings
...
Remove code from the string
Bug: 209335678
Test: Manually
Change-Id: I6de41a3a221831e3f13e7b7592b78b84df54cd7d
2021-12-16 14:19:18 +00:00
Bonian Chen
a93796f7a3
[Settings] Enable WiFi calling toggle in search
...
WiFi calling toggle in search need to pass the toggle request to
receiver to make it work.
Bug: 206871758
Test: local
Change-Id: If23d1ae1eaeb5d505e584dec94e1980f6e329c65
(cherry picked from commit a6a35b8409
)
2021-12-16 12:18:50 +00:00
Bonian Chen
a6a35b8409
[Settings] Enable WiFi calling toggle in search
...
WiFi calling toggle in search need to pass the toggle request to
receiver to make it work.
Bug: 206871758
Test: local
Change-Id: If23d1ae1eaeb5d505e584dec94e1980f6e329c65
2021-12-16 18:06:54 +08:00
Zoey Chen
a9de34cfab
Merge "[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5"
2021-12-16 09:34:14 +00:00
Zoey Chen
fcc30a08b3
[automerger skipped] [RESTRICT AUTOMERGE] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5 am: a582bb1092
am: baa1b112fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16475181
Change-Id: I41a5e05400565f76d3c3d42e221a1a65bdf8fecc
2021-12-16 09:18:01 +00:00
Zoey Chen
baa1b112fd
[RESTRICT AUTOMERGE] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5 am: a582bb1092
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16475181
Change-Id: I153cee7c647997e9ccec066075af5e1bacd7fb86
2021-12-16 09:01:48 +00:00
Zoey Chen
6978a90e88
[Settings] Remove MobileNetworkActivity
...
- remove the component name when launching the intent, using the action intent to replace.
- remove MobileNetworkActivity and rename SubscriptionSettingsActivity as MobileNetworkActivity.
Bug: 210593601
Test: atest
Change-Id: Icb7adaf9f7c7dfe01ff5c133aee8387c1663546c
2021-12-16 13:30:25 +08:00
Zoey Chen
9772f33cff
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5
...
Test: atest MobileNetworkSummaryControllerTest, NetworkProviderWifiCallingGroupTest, NetworkProviderBackupCallingGroupTest
Bug: 197066557
Change-Id: I829590bfa37ee2166d9388ccad35d306b201f844
2021-12-15 16:00:08 +00:00
Zoey Chen
a582bb1092
[RESTRICT AUTOMERGE] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5
...
Test: atest MobileNetworkSummaryControllerTest, NetworkProviderWifiCallingGroupTest, NetworkProviderBackupCallingGroupTest
Bug: 197066557
Change-Id: I829590bfa37ee2166d9388ccad35d306b201f844
2021-12-15 15:58:29 +00:00
Jan Tomljanovic
4436b7fe7d
Redirect intents leading to Security and Privacy pages
...
We want them to lead to SafetyCenter when it's enabled.
Test: atest SettingsUnitTests
Test: manual: android.settings.PRIVACY_SETTINGS and android.settings.SECURITY_SETTINGS intent actions open the intended target page depending on the flag.
Bug: 204978497
Change-Id: Idc0200f98da359cbf11952393d4c83599f3f541c
2021-12-15 14:43:33 +00:00
Zoey Chen
c0ff08c398
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.4 am: ad79a1819f
am: c4d1fc4fd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16475177
Change-Id: I759453090ac063dc4d8c79c1a18bcfb2cd861871
2021-12-15 14:15:12 +00:00
Zoey Chen
c4d1fc4fd2
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.4 am: ad79a1819f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16475177
Change-Id: Ie593095306f72abfbe3962994e117a084b00c853
2021-12-15 13:50:21 +00:00
Zoey Chen
ad79a1819f
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.4
...
Test: atest NetworkDashboardFragmentTest
Bug: 197066557
Change-Id: I9781af3a53fe7050b414f0574abb7618f8d71707
2021-12-15 10:19:49 +00:00
Treehugger Robot
a86e838b02
Merge "Settings: Extend the data role swap timeout value" am: bb994f627f
am: df2a22f104
am: 26bf610fd9
am: 16a3f98b71
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875
Change-Id: Icb00bc53ba6d7fb2e3fbf85a4c7a42b1dec99880
2021-12-15 07:47:41 +00:00
Treehugger Robot
16a3f98b71
Merge "Settings: Extend the data role swap timeout value" am: bb994f627f
am: df2a22f104
am: 26bf610fd9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875
Change-Id: I86be84ebc20266fb0b6af1b2faa196def582da55
2021-12-15 07:35:30 +00:00
Treehugger Robot
26bf610fd9
Merge "Settings: Extend the data role swap timeout value" am: bb994f627f
am: df2a22f104
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875
Change-Id: I0d456509b02715b141a6110ef89a476995ce5d67
2021-12-15 07:23:26 +00:00
Treehugger Robot
df2a22f104
Merge "Settings: Extend the data role swap timeout value" am: bb994f627f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875
Change-Id: I42a32278a74fd99f6f397c2c9d489f4bd94b3dc0
2021-12-15 07:06:33 +00:00
Treehugger Robot
bb994f627f
Merge "Settings: Extend the data role swap timeout value"
2021-12-15 06:49:44 +00:00