Xin Li
e82fc16e88
[automerger skipped] RESTRICT AUTOMERGE - Merge TQ2A.230305.008 am: 65d9917e8a
-s ours am: 6ef4e6bed1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21427977
Change-Id: I6a993e7a4b5d0ae633a832860f9319a1298dae35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 22:51:01 +00:00
Xin Li
6ef4e6bed1
[automerger skipped] RESTRICT AUTOMERGE - Merge TQ2A.230305.008 am: 65d9917e8a
-s ours
...
am skip reason: Merged-In I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932 with SHA-1 2ac6fc5709
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21427977
Change-Id: Id1449689909d6e3b0c755d648a26d25af75eceff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 22:04:46 +00:00
TreeHugger Robot
03403c48b3
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-02-15 21:38:56 +00:00
TreeHugger Robot
c094ce623b
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-02-15 21:38:56 +00:00
Bill Yi
b2e272639d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 55d7faff28
-s ours am: 10ba09612f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21431024
Change-Id: I655a9c6cd7ab057230a0d654bc339aba7c6c2743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 20:25:08 +00:00
Bill Yi
38f443fb62
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2d5a33748
-s ours am: ea62a80a18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21431024
Change-Id: I3c9b5278026c12dffbdd4e8bf36838f3636e6ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 20:24:57 +00:00
Bill Yi
8d2a59d528
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ea0587455f
-s ours am: 4274924f76
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21430602
Change-Id: Ie3555c6d6ae3b6b5a79b3008386f32be14c4d1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 20:24:43 +00:00
Bill Yi
78d5d2669e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e52f449fa2
-s ours am: 3cb47aa3bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21430602
Change-Id: Ib6708c9a5b7c8dbacae81b321b4dbdd2a355cf0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 20:24:24 +00:00
Bill Yi
10ba09612f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 55d7faff28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21431024
Change-Id: Iad795bcbd415cefb84037dfc20bd35f88fdac11f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 19:47:11 +00:00
Bill Yi
ea62a80a18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2d5a33748
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21431024
Change-Id: I252b26abc8bab5d1c204b06b672633106f896aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 19:47:00 +00:00
Bill Yi
4274924f76
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ea0587455f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21430602
Change-Id: I214216265b3ec12587957c5dfe948281fe44cc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 19:46:43 +00:00
Bill Yi
3cb47aa3bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e52f449fa2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21430602
Change-Id: I2e1d4ee2dcef6559a41af4ab55023ebd01b21bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 19:46:25 +00:00
Bill Yi
55d7faff28
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-15 19:21:32 +00:00
Bill Yi
ea0587455f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-15 19:21:32 +00:00
Joshua McCloskey
00a2136ffa
Dismiss dialog on acquire message event.
...
Test: Verified that any acquired message dismisses the touch dialog
Fixes: 265502746
Change-Id: I4791edeb9bfdb308778136cd91205560db59f0a8
2023-02-15 18:48:14 +00:00
Henri Chataing
963519a300
Merge "Nfc: Rename system properties in Nfc settings"
2023-02-15 18:36:23 +00:00
Jay Sullivan
6ed8f2b894
Merge "[Safety Labels] Decouple safety label changes from permission rationale"
2023-02-15 18:32:43 +00:00
Derek Jedral
eb08a84437
Merge "Show CombinedBiometric if active unlock enabled"
2023-02-15 18:03:55 +00:00
Behnam Heydarshahi
b5ecd4b87d
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev am: d89de47399
am: 3ee4929594
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549
Change-Id: Icca1292b29dc7682c36d901bce41d08f5ae3ab7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 16:09:19 +00:00
Behnam Heydarshahi
d9c3cf855f
Muting ring volume slider disables notification
...
With volume_separate_notification flag enbaled, muting ring volume
slice will cause notification volume slice to gray out.
There used to be a bug in which notification slice would not get
updated in response to a change in ring volume mute/unmute broadcast.
The resulting erroneous behavior was notification slider would get to
zero but not get grayed out. To fix that bug, VolumeSliceHelper listens
to ring stream mute/unmute broadcasts and forwards them to notification
slice.
Bug: b/266072907
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="NotificationVolumePreferenceControllerTest|VolumeSliceHelperTest" RunSettingsRoboTests -j40
Change-Id: I2ab51f1272bf99a0c3d9ca285354052d00910c90
2023-02-15 15:43:08 +00:00
Neil Fuller
ddbbcbab5b
Merge changes Ifd96c543,I1a0faa44
...
* changes:
Further status logic tweaks
Tweak status display logic and tests
2023-02-15 15:15:21 +00:00
Behnam Heydarshahi
3ee4929594
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev am: d89de47399
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549
Change-Id: If4cfdeb37dbcc49ce9ec36bee690df4db1a87213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 15:08:56 +00:00
changbetty
3512374f62
To fix the footer link is not clickable in the Bluetooth Settings
...
- Links are not allowed in footer preference title now. So follow the
Wi-Fi UX design to add the string "Change". Let the user to click and
go to the Bluetooth scanninng settings
Bug: 265167737
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Change-Id: If9e666df7b987e0dbe3d550ac0af03b9d79230de
2023-02-15 14:31:49 +00:00
Behnam Heydarshahi
d89de47399
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev
2023-02-15 14:28:15 +00:00
Bonian Chen
e47ba046ac
Merge "[Settings] IMEI should be enabled regardless existance of SIM"
2023-02-15 12:22:15 +00:00
Arc Wang
319cac993c
Merge "Fix crash when switching Display size"
2023-02-15 11:08:15 +00:00
Philip Junker
6e6a7acbd2
Merge "Use separate SETTINGS_TURN_SCREEN_ON_ACCESS id for TurnScreenOnSettings"
2023-02-15 10:25:31 +00:00
Bonian Chen
535b518ac9
[Settings] IMEI should be enabled regardless existance of SIM
...
Force IMEI fields always enabled.
Bug: 266877869
Test: auto
Change-Id: Ic164b3c171fd673cfb02d9973d4c210585198707
2023-02-15 10:16:36 +00:00
Elliot Sisteron
ba891783de
Merge "Change order values of entries in AdvancedSecurity"
2023-02-15 10:09:00 +00:00
Alex Johnston
97658e3a1f
Merge "Implement OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS exemption"
2023-02-15 09:37:12 +00:00
Arc Wang
ff8c5e0079
Fix crash when switching Display size
...
Ensure mHighlightMixin is not null before using it.
Bug: 269385877
Test: manual
Change Display size and observe if Settings crashes.
Change-Id: I9c7ca8d490f7ede6b73d09d51c3e304844e7df0c
2023-02-15 16:03:24 +08:00
Zoey Chen
cf9562beff
[Settings] Should remove the subcription listener
...
Bug: 268405538
Change-Id: Ic96fa0b9a294c3de54cea4b3be52d6f2807c0ada
Test: manual
2023-02-15 06:58:10 +00:00
TreeHugger Robot
3f7cdbf12b
Merge "Attach FingerprintEnrollFinishFragment to activity"
2023-02-15 05:04:57 +00:00
Jay Thomas Sullivan
9f8da1f9be
[Safety Labels] Decouple safety label changes from permission rationale
...
Currently the "Safety Label Changes" feature is toggled on only when the
following two feature flags are enabled:
1. safety_label_change_notifications_enabled
2. permission_rationale_enabled
Remove the dependence on "permission_rationale_enabled", so that "Safety
Label Changes" only relies on the
"safety_label_change_notifications_enabled" flag.
Bug: 269330969
Test: atest PermissionControllerMockingTests:SafetyLabelChangesJobServiceTest; atest CtsPermission3TestCases:SafetyLabelChangesJobServiceTest;atest CtsPermission3TestCases:AppDataSharingUpdatesTest
Change-Id: Ie82bf6a5b6fe1d8cbe6ab58d23085e01c748b5c3
2023-02-15 04:33:38 +00:00
menghanli
95be9d5dc2
[automerger skipped] Add a done button to vision setting pages in setup flow am: 991b70c720
am: af1f8ed6ad
-s ours
...
am skip reason: Merged-In Id3a0d78389e0e6c11b5b5cf016b37673fde7f286 with SHA-1 dd2ec775c8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21414425
Change-Id: I4a83bd2a6b05bda7521e5acaf872d8e03ddfb827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 03:28:17 +00:00
TreeHugger Robot
f2d8b111e0
Merge "[SPA] Move the network folder to spa/"
2023-02-15 03:21:24 +00:00
menghanli
af1f8ed6ad
Add a done button to vision setting pages in setup flow am: 991b70c720
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21414425
Change-Id: Ibb2f4831810685728481e6a9ba5073c3252b9968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 02:33:03 +00:00
Aswin Sankar
eaa2fa8e7a
Merge "Remove "Backup Calling" button from Settings UI"
2023-02-15 02:22:56 +00:00
Bill Yi
e2d5a33748
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I89a9586453eee0e88d4aca8771fb8a582e2b32b5
2023-02-14 18:01:45 -08:00
Bill Yi
06552ec0ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I13b788e2f593e95e1754e7054d5299afd9841976
2023-02-14 17:58:26 -08:00
Bill Yi
e52f449fa2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4134c3f26fd6779ddbc882bc377966c57570e245
2023-02-14 17:55:33 -08:00
Bill Yi
f9385219ea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I34ef5a96296b41031a1918160de8344f2055b8a4
2023-02-14 17:54:11 -08:00
TreeHugger Robot
3ce2b2e85b
Merge "Enforce device policy in credential manager (settings)"
2023-02-15 01:23:56 +00:00
Xin Li
65d9917e8a
RESTRICT AUTOMERGE - Merge TQ2A.230305.008
...
Bug: 264720040
Merged-In: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
Merged-In: I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932
Change-Id: I5833464626eb06a01d6979c477be98ba06827893
2023-02-14 16:31:37 -08:00
Aswin Sankar
812b59b981
Remove "Backup Calling" button from Settings UI
...
Pixel will not use 'Backup Calling' setting to enable cross-SIM calling.
Code may live on in aosp for other OEMs.
Revert of 9adfa375ea
with changes to
remove lines with "ToDo Deprecate".
Bug:21153988
Test: Live test for cross-SIM calling across both subs.
Change-Id: I90e04ebf9f7bc3a05f459f59775ea7baa18716da
2023-02-14 16:04:50 -08:00
menghanli
991b70c720
Add a done button to vision setting pages in setup flow
...
Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work.
Solution: Add a done button to the vision settings pages for clearer navigation. This change combines parts of commit 5e931b2c23
and commit dd2ec775c8
.
Bug: 262995569
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest
Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
Merged-In: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
(cherry picked from commit dd2ec775c8
)
2023-02-15 06:32:57 +08:00
Derek Jedral
4d32e70a60
Show CombinedBiometric if active unlock enabled
...
We want to show this page as long as active unlock is enabled. The
underlying check of isAvailable checks if the appropriate biometrics are
available and updates the title accordingly.
Test: manual test, confirm combined page appears when active unlock on
Test: atest BiometricsSafetySourceTest
Bug: 264812908
Change-Id: I5da1c20d65b879751bdd615c14c2f8a71cc54d80
2023-02-14 22:24:25 +00:00
Becca Hughes
db0ba1ad3d
Enforce device policy in credential manager (settings)
...
Centralizes the provider list generation logic
in CredentialProviderInfo and enforce device
policy. Adds an test API that can be used by
CTS.
Bug: 261978289
Test: ondevice & cts
Change-Id: Idb7d75dc84e1a34025054075bc78b3c3d06f130f
2023-02-14 18:47:00 +00:00
Josep del Río
282b5201a7
Merge "Use InputSettings in Settings app"
2023-02-14 17:18:40 +00:00
TreeHugger Robot
8fe240626a
Merge "[Regional Preference] Append unicode tags to new system language."
2023-02-14 13:47:59 +00:00