Commit Graph

99005 Commits

Author SHA1 Message Date
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
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
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
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
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
Jason Hsu
5b240cfa7d Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev am: 4ae25ef592 am: f6f978ec38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16464242

Change-Id: If2a8c089ab2a3d105e870fa40fe1dd16f8bfbed2
2021-12-15 06:40:22 +00:00
Jason Hsu
f6f978ec38 Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev am: 4ae25ef592
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16464242

Change-Id: Ie87bc598fbba95ef042b3be813801a437adeace3
2021-12-15 06:23:47 +00:00
Jason Hsu
4ae25ef592 Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev 2021-12-15 06:11:18 +00:00
Zoey Chen
d35ea04c83 Merge "[Settings] Remove the legacy 2-pane registration" 2021-12-15 03:26:38 +00:00
Xin Li
370ab66900 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours am: 54916e10e8 -s ours am: 539e62512b -s ours
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1921978

Change-Id: I0cea6e259417d2a643b2176f3a9a8e0641c4ecb3
2021-12-14 22:18:50 +00:00
Xin Li
539e62512b [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours am: 54916e10e8 -s ours
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1921978

Change-Id: I39022c9f6e91c2722d2f78e8f19da0cd96488532
2021-12-14 21:51:00 +00:00
Xin Li
54916e10e8 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1921978

Change-Id: I5eeeaca9b47404dafc838583ff60cabf80184161
2021-12-14 21:24:07 +00:00
Xin Li
50d6b616d7 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1921978

Change-Id: I14e4d4bad0bf56de1031170010143763bcb4300d
2021-12-14 21:00:16 +00:00
Xin Li
798e3d7d11 Merge "Merge Android 12 QPR1" 2021-12-14 20:26:01 +00:00
Xin Li
475d27801f Merge Android 12 QPR1
Bug: 210511427
Merged-In: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
Change-Id: I750e1a1f03c22a58637ff65825756d849ab089b5
2021-12-14 08:39:13 -08:00
Yasin Kilicdere
cc1d210fd0 Create a simple fallback activity for supervised user creation
Create a simple fallback activity to be started if no other activity could be
resolved when Add supervised user option is tapped in Multi User settings.

Bug: 207495450
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: I850a2798567787c2494c75aa5fa451ddf373410d
2021-12-14 15:39:42 +00:00
Yasin Kilicdere
2a37149ec5 Add settings entrypoint to add a supervised user
Bug: 205101183
Bug: 199868785
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: Ie69786c81ec938f4c4108d7fc9c0874776331865
2021-12-14 14:47:53 +00:00
Jason Hsu
8eb2aeafa4 Revert "Add new string to hint user of triple-tap shortcut delay"
This reverts commit dc156e77b4.

Reason for revert: New flow for magnification switch shortcut need to be fine-tuned again. Punt this flow to Android T, so revert the string.

Change-Id: Ieb48b8e3e34b96130193cf8499ff8f49e5954b1f
2021-12-14 09:39:01 +00:00
Zoey Chen
2c1fe3ca47 [Settings] Remove the legacy 2-pane registration
Test: atest
Bug: 209606859
Change-Id: Ia1788cdfd9a9e4c6bfeb25be1257f82900867114
2021-12-14 12:32:34 +08:00
Bonian Chen
c0572ddaa7 Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8 am: 718c17039e am: 29863c9d8d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: Icae124324889814429e85c6a4fef78a58e1b6850
2021-12-14 03:03:58 +00:00
Bonian Chen
f0b73cabf7 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54 am: 2bed540284 am: 6418f1822d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I3cdfc7fe343d68f0c10b733a367f56669a8a7b4e
2021-12-14 03:03:34 +00:00
SongFerng Wang
d42db7ebbf [automerger skipped] Merge "To disable the preferred network mode UI during calling." am: 9dec28892c am: a74e6cd2ec am: 38a109d745 am: 81d58df274 -s ours
am skip reason: Merged-In Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5 with SHA-1 19a5b81eb0 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: I90c26f124e0c8514759a27dfa2c96f623e268887
2021-12-14 03:02:02 +00:00
Bonian Chen
29863c9d8d Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8 am: 718c17039e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: I8a84ff16006d462a0afef993132bfb081eff1537
2021-12-14 02:53:55 +00:00
Bonian Chen
6418f1822d Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54 am: 2bed540284
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I52e8fc8a2ec4529d94b36d9a7d4697d82d88b118
2021-12-14 02:53:53 +00:00
Bonian Chen
718c17039e Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: I2da154061359ad72ffa736873f06052be93ed721
2021-12-14 02:46:06 +00:00
Bonian Chen
2bed540284 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: Icba1cb39911ec1e06b3952117e95ccf03630aeae
2021-12-14 02:46:04 +00:00
SongFerng Wang
81d58df274 Merge "To disable the preferred network mode UI during calling." am: 9dec28892c am: a74e6cd2ec am: 38a109d745
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Ie25bb9a2faee5e4ed58591e903778e3db21ef838
2021-12-14 02:44:15 +00:00
Bonian Chen
54ee717db8 Merge "[Settings] Fix failure test case" am: 57a7978f8c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
2021-12-14 02:30:55 +00:00
Bonian Chen
54e4845d54 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I9c1bd5949a1c76ef3ef97868ada3b850af5bc68e
2021-12-14 02:30:53 +00:00
SongFerng Wang
38a109d745 Merge "To disable the preferred network mode UI during calling." am: 9dec28892c am: a74e6cd2ec
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Id3a811f5d3d37fc0e361811b27d76c8a0806c95b
2021-12-14 02:22:54 +00:00
Bonian Chen
57a7978f8c Merge "[Settings] Fix failure test case" 2021-12-14 02:09:36 +00:00
Bonian Chen
078f873ccc Merge "[Settings] Refactor Wifi Calling description text" 2021-12-14 02:09:36 +00:00
SongFerng Wang
a74e6cd2ec Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Ibdad65e0fc67eed1f57bcf076fe5e8ea577fa21d
2021-12-14 01:58:22 +00:00