PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,340 Commits 1 Branch 0 Tags
65dcdcbdd8e9894f4aff8dfd0c036fba4b743b4a
Commit Graph

138340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Angela Wang
65dcdcbdd8 Merge "New hearing device pairing page: ignore bonded device" into main 2024-02-07 12:31:51 +00:00
Angela Wang
c9875fc836 Merge "New hearing device pairing page: check gatt status" into main 2024-02-07 12:31:37 +00:00
Matías Hernández
67484c2791 Merge "Fix cast of RestrictedSwitchPreference to SwitchPreference" into main 2024-02-07 11:00:03 +00:00
Angela Wang
4972c58783 New hearing device pairing page: ignore bonded device 
The device might still in advertising mode even if it's bonded. We can
just ignore this kind of devices in the scanning result.

Bug: 307890347
Test: manual test
Change-Id: I782cc62edd4fec779f5f55444425b32a77f85e5e
 2024-02-07 10:22:24 +00:00
Angela Wang
3ca9ef8edc New hearing device pairing page: check gatt status 
Checks the gatt status in `onConnectionStateChange()` and `onServiceDiscovered()` callbacks. Disconnects and removes the gatt from the `mConnectingGattList` if the gatt status is not success in these callbacks.

Bug: 307890347
Test: manual test
Change-Id: Iab09f13b2ff3d33e5c4d6a8710736307c26b17e7
 2024-02-07 08:54:41 +00:00
Zoey Chen
6368895adf Merge "[ToA] Metrics in Settings" into main 2024-02-07 08:07:13 +00:00
Wu Ahan
3bea5fcc98 Merge "Increase test coverage for fps pause enrollment feature" into main 2024-02-07 07:28:54 +00:00
Zoey Chen
7dc497dfcc [ToA] Metrics in Settings 
Bug: 323462103
Test: atest TermsOfAddressNotSpecifiedControllerTest
Test: atest TermsOfAddressNeutralControllerTest
Test: atest TermsOfAddressMasculineControllerTest
Test: atest TermsOfAddressFeminineControllerTest
Change-Id: I09c3ad4c92275ba48b810b1971a4e98e54e5136d
 2024-02-07 05:46:16 +00:00
SongFerng Wang
5b716c2c6b Merge "SIM Onboarding flow completed" into main 2024-02-07 04:48:55 +00:00
Becca Hughes
407a6d2723 Merge "Update strings to match updated figma" into main 2024-02-06 23:19:43 +00:00
Becca Hughes
3aa7212b26 Merge "Fix enterprise settings bug" into main 2024-02-06 22:35:07 +00:00
Becca Hughes
47469160c8 Update strings to match updated figma 
These three strings are updated to match
the latest figma mocks:

https://screenshot.googleplex.com/6JvDwmhKh3ANTzR

Other strings like the summary text will
be done in a follow up.

Test: on device
Bug: 322074376
Change-Id: I70b7a5317056abc669d581d11ba2b93dad2adba4
 2024-02-06 10:02:43 -08:00
Wu Ahan
5e577c03e5 Increase test coverage for fps pause enrollment feature 
Bug: 288155127
Test: atest SfpsEnrollmentFeatureImplTest
Change-Id: I1a067d78262daf4903dd7a8b8c60b582c0945719
 2024-02-06 15:15:15 +00:00
songferngwang
f1ea484425 SIM Onboarding flow completed 
- Add the setup flow for switching sim and rename and setup primary sim
  items
- Add the bottom sheet and progress dialog.
Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: build pass. Will upload another cl for testing

Change-Id: Ie9680f0a67afe453c1449c0f2b59e98fd627e215
 2024-02-06 10:56:59 +00:00
Yiyi Shen
ac869a57ad Merge "[Audiosharing] Avoid dialog flickering for same bt device group." into main 2024-02-06 06:26:30 +00:00
Yiyi Shen
10bddfd334 [Audiosharing] Avoid dialog flickering for same bt device group. 
Before this change, the dialog will dismiss and show up again if the
second bud of the same group is connected.

In this change, StopDialog and JoinDialog will only update the message
and event listener when the dialog is triggered by another device with the same group id or the new bt device with different group id. (No dismiss and show); DisconnectDialog will only dismiss and show again when a new bt device with different group id is connected and update the event listener when another device with the same group id connected.

Also dismiss the dialog when the triggering device disconnect or join
the sharing.

Test: atest
Bug: 305620450
Change-Id: I798812101cefb24185d76d56f78eae27712dd7a6
 2024-02-06 11:52:58 +08:00
Fan Wu
27301f68b5 Fix test failure caused by ag/26108859 
Bug: 293405483

Test: atest
Change-Id: I980d71bf31d63013cdeefb90aa3701851f038600
 2024-02-06 03:25:06 +00:00
Chris Antol
9531458ca5 Merge "Multiple users yields a search result despite being disabled" into main 2024-02-05 20:36:03 +00:00
Omer Ozer
aed65c3423 Merge "Disable nfc foreground setting ui when the wallet role is enabled." into main 2024-02-05 19:44:48 +00:00
Joseph Vincent
639b93d652 Merge "Update with correct private space settings strings" into main 2024-02-05 19:12:10 +00:00
Becca Hughes
401ebcb53d Fix enterprise settings bug 
This fixes a bug where the picker
is not using the correct user id
and also ensures that the settings
activity uses the correct user when
launched.

Test: flash & test w/ work profile
Bug 322071206

Change-Id: I846593ff9ae320d9bb774e3e79ed9ef41f101ff5
 2024-02-05 10:58:09 -08:00
Richard MacGregor
9ed6467714 Merge "Add developer option for screenshare protections" into main 2024-02-05 18:34:50 +00:00
josephpv
9485350074 Update with correct private space settings strings 
go/ss/3hD89o5RDzqyYYe.png
go/ss/68ENFD7LdFGZvBu.png
go/ss/AFJ9kguWRUVBJNY.png
go/ss/5LEpFhBBH2TWeKp.png
go/ss/BnFekSCyjvWq3nj.png
go/ss/3RpVrz9q4LUa6Cb.png
Recording link : b/317312835#comment3

Bug: 317312835
Bug: 317312410
Test: Manually verified strings
Change-Id: I3cf2e45d5056f7659bbf0b78d632d425dc8b890b
 2024-02-05 17:17:07 +00:00
Elliot Sisteron
8d89dbc5ae Merge "Fix tests for SecurityAdvancedSettings." into main 2024-02-05 16:59:23 +00:00
Elliot Sisteron
2904abd561 Merge "Fix tests for BiometricsSafetySource and LockScreenSafetySource." into main 2024-02-05 16:56:03 +00:00
YK Hung
e1563ef347 Merge "Update the battery saver scheduler minimum level" into main 2024-02-05 16:33:19 +00:00
Elliot Sisteron
5418e292c9 Fix tests for SecurityAdvancedSettings. 
It seems these tests have been failing for a while (probably they were never passing in the first place; as the issue appears to be with the tests and not the prod code).

Are they not being run on pre and/or post-submit?

Bug: 323650746
Change-Id: I97db7183898930792d1ff0d2de592f26f8b78b01
Test: atest SecurityAdvancedSettingsTest
 2024-02-05 12:58:30 +00:00
Elliot Sisteron
f26e541e86 Fix tests for BiometricsSafetySource and LockScreenSafetySource. 
It seems these tests have been failing for a while (probably they were never passing in the first place; as the issue appears to be with the tests and not the prod code).

Are they not being run on pre and/or post-submit?

Bug: 323649900
Test: atest LockScreenSafetySourceTest && atest BiometricsSafetySourceTest
Change-Id: Ie75241455317da6749ccf648dae71c49ea9f766f
 2024-02-05 11:56:53 +00:00
Matías Hernández
41367eab25 Fix cast of RestrictedSwitchPreference to SwitchPreference 
The class was changed to extend SwitchPreferenceCompat instead in ag/25160408.

Fix: 323649099
Test: atest ChannelListPreferenceControllerTest
Change-Id: I0d9fd82d0087dd11eb7c3d6c6912788725b18b43
 2024-02-05 12:28:42 +01:00
Mark Kim
6b64e92fc8 Merge "Use a separated flag for archiving feature in Settings" into main 2024-02-05 10:55:37 +00:00
Iavor-Valentin Iftime
fd83c37c8b Merge "Enable polite notifications by default for work profiles" into main 2024-02-05 10:28:28 +00:00
ykhung
b0fe225a17 Update the battery saver scheduler minimum level 
Fix: 317069349
Test: make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.fuelgauge"

Change-Id: I398cd192609914841a55f110290915df8cd0e9eb
 2024-02-05 17:58:37 +08:00
Yanting Yang
57396905d8 Remove yantingyang from OWNERS 
Test: N/A
Change-Id: I3f0f4b073f3519b6233ed3540cc05d083d53845e
 2024-02-05 08:46:27 +00:00
Chaohui Wang
0f120783bf Merge "Use AppOpsController for AlarmsAndReminders" into main 2024-02-05 08:14:25 +00:00
Weng Su
2f21670dab [automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99 am: 2a9ea31fb5 -s ours am: a10cad4433 -s ours am: fe96539f5e -s ours am: f8aff71fda -s ours 
am skip reason: contains skip directive

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

Change-Id: Idf77ea8d5032f2c1cdeb7dd2941c6bb5d4a46cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 07:50:34 +00:00
Weng Su
f8aff71fda [automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99 am: 2a9ea31fb5 -s ours am: a10cad4433 -s ours am: fe96539f5e -s ours 
am skip reason: contains skip directive

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

Change-Id: I5ecac8ff46ac26963a6ce21a136adbbb55926424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 07:07:05 +00:00
Weng Su
d2514632c9 [automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99 am: 2a9ea31fb5 -s ours am: a10cad4433 -s ours am: 18b6a3eb49 -s ours 
am skip reason: contains skip directive

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

Change-Id: I302fc948f0ba92dde1b28d6bc451cb2445f4c9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 07:06:23 +00:00
Weng Su
18b6a3eb49 [automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99 am: 2a9ea31fb5 -s ours am: a10cad4433 -s ours 
am skip reason: contains skip directive

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

Change-Id: I061a737e95bc9670072ef8c88474b1743722ef9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 06:23:48 +00:00
Weng Su
fe96539f5e [automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99 am: 2a9ea31fb5 -s ours am: a10cad4433 -s ours 
am skip reason: contains skip directive

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

Change-Id: I1ba1c842165d3f1b4607139f482c7550f26e25ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 06:22:00 +00:00
Weng Su
a10cad4433 [automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99 am: 2a9ea31fb5 -s ours 
am skip reason: contains skip directive

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

Change-Id: I3177d414de61d78210c1912866373de83c95c2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 05:40:32 +00:00
Xinyi Mao
4ee7a3f5cb Merge "Add BATTERY_DATA permission for batteryusage.BootBroadcastReceiver" into main 2024-02-05 05:28:04 +00:00
Aman Gupta
d431deb429 Merge "Updating strings as per the suggestion in b/318837875." into main 2024-02-05 04:06:43 +00:00
mxyyiyi
98785eef45 Add BATTERY_DATA permission for batteryusage.BootBroadcastReceiver 
Bug: 323497440
Test: manual
Change-Id: If2e2f34c13914a3d4e36f343fa91b40407335639
 2024-02-05 11:51:13 +08:00
Daniel Norman
4ed106c909 Merge "Revert "Replace ShortcutType with UserShortcutType to reduce dup..."" into main 2024-02-05 02:56:49 +00:00
Weng Su
68b5ead3e9 [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: fa691e2a57 -s ours am: c95682730b -s ours am: a9da905a3e -s ours am: 76e4fde650 -s ours 
am skip reason: contains skip directive

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

Change-Id: I014051ce0fec52c171a67f31d02068c3df46f2ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 01:50:52 +00:00
Weng Su
76e4fde650 [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: fa691e2a57 -s ours am: c95682730b -s ours am: a9da905a3e -s ours 
am skip reason: contains skip directive

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

Change-Id: Ibd5f19f6b8310a88dcd3f0b0baec9633b116cad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 01:06:55 +00:00
Weng Su
d19466c6ff [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: fa691e2a57 -s ours am: c95682730b -s ours am: 4fbfed8c94 -s ours 
am skip reason: contains skip directive

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

Change-Id: I35b432594ff7cc74861d0a842d3df2fa5c2be3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 01:06:16 +00:00
Weng Su
18c3dc0f01 [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c am: b33f9b8f8a am: 83a895fe12 -s ours 
am skip reason: contains skip directive

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

Change-Id: I6a1a28844f8a03188e6f5db68a4ff9b06a80def2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 00:47:44 +00:00
Weng Su
4fbfed8c94 [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: fa691e2a57 -s ours am: c95682730b -s ours 
am skip reason: contains skip directive

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

Change-Id: I939c63e24409023c6d93913e9fa247fe2fbe70be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 00:25:13 +00:00
Weng Su
a9da905a3e [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: fa691e2a57 -s ours am: c95682730b -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie1e2a71e090cd73e1f002a634440d8047a862d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 00:23:27 +00:00