PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,877 Commits 1 Branch 0 Tags
4916f22ad5a5c89c40deaf166d326337c76b418c
Commit Graph

138877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jay Thomas Sullivan
91bcebcf62 [ECM] Declare MANAGE_ENHANCED_CONFIRMATION_STATES permission (Settings) 
Declare the MANAGE_ENHANCED_CONFIRMATION_STATES permission in
packages/apps/Settings/AndroidManifest.xml.

Settings needs this permission to interact with
EnhancedConfirmationManager.

(Note that this is strictly a hint. In practice, Settings uses the
system uid has therefore access to the permission regardless of
whether we declare it here.)

Test: presubmit
Bug: 320512579
Change-Id: Id9eda14b6e3b0d4f0f45b6bb039d9ac84260a740
 2024-02-05 14:07:40 -08: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
Weng Su
83a895fe12 [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c am: b33f9b8f8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26069282

Change-Id: Ie7548054d0a3a63086427b9398e8dd16d84fafd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 00:03:58 +00:00
Weng Su
c2d85d9d9f [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c am: dbc5512077 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ifa57465196680b2fd5237f85ed5bee609730ee4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 00:03:09 +00:00
Weng Su
2a9ea31fb5 [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111

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

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

Change-Id: Ib0a1e348dbe49db3cf9187915521f1cc0a7c75a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-04 23:44:27 +00:00
Weng Su
dbc5512077 [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26069282

Change-Id: Idb35be691b002767e241c331ab9df5ba7420bf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-04 23:21:48 +00:00
Weng Su
b33f9b8f8a [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26069282

Change-Id: I95a273524cc758ed7abe08b76ae4b2631a850ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-04 23:20:04 +00:00
Weng Su
a71eb50f99 [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111

Change-Id: I29aa05d1b2b3aa43c53d83578fa03be3938bb083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-04 22:59:57 +00:00
Weng Su
fa691e2a57 [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111

Change-Id: I47c5b50adad57423c0c3359c751dd89e51203316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-04 22:59:44 +00:00
Chaohui Wang
0c630c348d Use AppOpsController for AlarmsAndReminders 
Instead of AlarmsAndRemindersController, to always provide the correct
status.

Bug: 322916468
Test: manual - on Alarms & reminders page and switch between apps
Test: unit test
Change-Id: Ia428b426895f35e0d11c25c58dc89a06e564afe7
 2024-02-04 07:11:45 +00:00
Lifu Tang
2f1943b267 Merge "Restrict WifiScanModeActivity when user restriction applies" into main 2024-02-04 06:55:41 +00:00
Chaohui Wang
2222ab9438 Merge "Use collectAsCallbackWithLifecycle" into main 2024-02-04 05:52:59 +00:00
Omer Ozer
392e4f1abe Disable nfc foreground setting ui when the wallet role 
is enabled.

Bug: 315194263
Test: local
Change-Id: I495c6c62b841617cf7914703740d8b52f628fd45
 2024-02-04 03:45:22 +00:00
Ze Li
b47d077dd0 Merge changes from topic "exclusive-manager" into main 
* changes:
  [Hide DCK devices] Hide DCK devices from settings app (other devices section).
  [Hide DCK devices] Hide DCK devices from settings app (saved devices page).
 2024-02-04 03:22:24 +00:00
Yiyi Shen
94e7399979 Merge "Fix CallsAndAlarmsPreferenceControllerTest" into main 2024-02-04 03:19:54 +00:00
YK Hung
d7ac64555d Merge "Fix failed test case for BatteryTip in Settings" into main 2024-02-04 02:13:34 +00:00