Pavel Grafov
e2f4baed0b
Merge "Let Settings query per-admin policies"
2021-12-20 15:57:57 +00:00
Linus Tufvesson
553ca3e58d
Make WifiDppEnrolleeActivity launches explicit
...
Bug: 180518134
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppUtilsTest\|WifiDialogActivityTest
Test: Manually verified b/180518134 attack is no longer possible
Change-Id: I8c4e1e17117582c78671d0e4658bd87715a9a046
(cherry picked from commit 59c0a7bc63
)
2021-12-20 15:21:25 +00:00
William Escande
23ebda4c12
Add QUERY_AUDIO_STATE permission
...
This permission is added to getLastAudibleStream
Bug: 190422401
Tag: #refactor
Test: Build + start a2dp + play music + change volume from DUT/speaker
Change-Id: I65c5e6f50e7b440af57b2a0bd6656db91446578b
2021-12-20 13:45:47 +01: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
Patrick Huang
eb8d35c9cc
Add config for showing/hiding emergency setting entry
...
Add a definition for a boolean config value that will be used by
devices to show or hide the "Safety & emergency" setting entry in
Android top-level Settings.
Bug: 205581282
Test: manual on devices in question, PTS
Change-Id: Iec838505c4eea9c0d6c5db1379f9b4651eea7778
2021-12-17 08:38:15 +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
Alex Johnston
6a8cbc9fac
Fix USB tether option
...
* USB tether option will be grayed out before
USB cable is plugged in.
Bug: 192225597
Test: manual testing
Change-Id: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
Merged-In: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
(cherry picked from commit 685cacb540
)
2021-12-15 13:57:04 +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
Android Build Coastguard Worker
0f86669be4
Merge cherrypicks of [16100469, 16184933, 16414971] into sc-qpr1-release.
...
Change-Id: Id8b92050daec05bb9f6f4a94d120af46b15ee1f1
2021-12-15 00:05:26 +00:00
Alex Johnston
3dd874316a
Add non system overlay flag to InstallCaCertificateWarning
...
Bug: 196969991
Test: Manual testing with Settings
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157
)
(cherry picked from commit 02e8f56e67
)
Merged-In:Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
2021-12-15 00:03:15 +00:00
Bill Yi
d2d3da3850
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
(cherry picked from commit ffc0ed7b89
)
Merged-In:I6966abfdfdbf672b27528c1761eb23b95aefe521
2021-12-15 00:03:06 +00:00
Yanting Yang
a36d55e8f8
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620
)
(cherry picked from commit 5549bf8cd0
)
Merged-In:I8f0b066de710169ee8b922c44b6519ca21b9c7ef
2021-12-15 00:02:58 +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