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
Lifu Tang
7a792e0b8f
Restrict WifiScanModeActivity when user restriction applies
...
Bug: 299633613
Change-Id: If8cfb7047c0131da451a7af0d2b5108080876b85
2024-02-03 18:55:47 +00:00
Yiyi Shen
4e0315d2a3
Fix CallsAndAlarmsPreferenceControllerTest
...
Test: atest
Fix: 323634491
Change-Id: I627a3b6926c86f5e90dcfb27ed794ffb09aa4cfa
2024-02-03 21:53:16 +08:00
Jason Hsu
2eba5be9b4
Merge "Fix corss-link hearing device settings" into main
2024-02-03 09:57:04 +00:00
Pajace Chen
4af6ae88a4
Fix failed test case for BatteryTip in Settings
...
- Replace the deprecated mocktio rule with MockitoJUnit.rule
- Fix the failed test cases
- Update the testing convention
Bug: 323627875
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batterytip
Change-Id: I25a39c8e7ad07482352c1e2152d8e16555429ab1
2024-02-03 17:24:42 +08:00
Chaohui Wang
213c998557
Use collectAsCallbackWithLifecycle
...
Instead of observeAsCallback, since isAllowed is a flow now.
Bug: 322916468
Test: manual - on Toggle Permission page and switch between apps
Test: unit test
Change-Id: Ic33a7d6cd7c71c7cf6cd4a6e353505fa12cf0046
2024-02-03 04:12:39 +00:00
Richard MacGregor
dc15244a5d
Add developer option for screenshare protections
...
Add developer option that allows disabling screenshare protections to
allow for better bug reports and debugging.
Bug: 320757744
Bug: 316955558
Bug: 316954829
Flag: ACONFIG com.android.server.notification.sensitive_notification_app_protection DISABLED
Flag: ACONFIG com.android.server.notification.screenshare_notification_hiding DISABLED
Test: atest SensitiveContentProtectionPreferenceControllerTest
Change-Id: Ibcb9f886aa599fe2442e755653c49f44cfa1830f
2024-02-02 19:33:35 -08:00
Pajace Chen
32587dbdcf
Merge changes from topics "low_battery_tip", "new_settings_card" into main
...
* changes:
[BatteryTip] Implement new CardPreference to apply new style
[BatteryTips] Separate the low battery tips
2024-02-03 01:45:21 +00:00
Daniel Norman
6c229865c9
Revert "Replace ShortcutType with UserShortcutType to reduce dup..."
...
Revert submission 25959129-chunkulin-replace-shortcutTypeConstant
Reason for revert: Reverting refactoring, to land after 24Q2 branches off of main. See b/323463488
Reverted changes: /q/submissionid:25959129-chunkulin-replace-shortcutTypeConstant
Change-Id: I323637727f4b642b3a6c626eae62bdaf0032eaf2
2024-02-03 00:23:15 +00:00
Becca Hughes
d8a82105e0
Merge "Fix settings flakiness bug" into main
2024-02-03 00:15:57 +00:00
Adam Bookatz
5eccc6327b
Merge "Settings: Profiles inherit call restrictions" into main
2024-02-02 22:47:27 +00:00
Becca Hughes
7df4f0f4bd
Fix settings flakiness bug
...
The flakiness was caused by mVisibility
being out of sync and resulting in the
preference being hidden / shown incorrectly.
Test: manual & unit tests
Bug: 322072349
Change-Id: I588da2100b8f2cea38f2bdb63af4e8d19d0efd0b
2024-02-02 22:43:30 +00:00
Aishwarya Mallampati
abf2a6ae52
Merge "Disable Wi-Fi calling roaming preferrence while using NTN." into main
2024-02-02 22:40:50 +00:00
Jacky Wang
b16781d2bc
Merge "Support "Independent system keyboard haptics settings"" into main
2024-02-02 19:23:33 +00:00
Hao Dong
cdf34b66cb
Merge "Show split screen dialog on the introduction and enrolling page." into main
2024-02-02 18:30:46 +00:00
Torne (Richard Coles)
80ef43e7be
Use WebViewUpdateManager instead of raw AIDL.
...
Use the new IPC wrapper WebViewUpdateManager instead of directly
consuming IWebViewUpdateService.
Bug: 319292658
Test: m RunSettingsRoboTests
Change-Id: I75a3788aeac9757ce423454c4b6a2a63f5c4f4b2
2024-02-02 12:37:21 -05:00
Mark Kim
7adac0459c
Use a separated flag for archiving feature in Settings
...
The new flag will replace the current PM-flag eventually, once they reach the same rollout status. Until then both flags are kept concurrently, to avoid a rollback of the feature.
This is done to reduce risk and potentially enable an isolated rollback
of Settings related logic, while keeping system logic intact.
Additionally, fix bug by replacing `System.getProperty("pm.archiving.enabled")` to `SystemProperties.getBoolean("pm.archiving.enabled", false)`
Test: InstalledAppCounterTest, AppButtonsTest, HibernationSwitchPreferenceTest
Bug: 323164382
Change-Id: I44a41d6a43a12134c4e3aa5df8ad6a9eb91758d4
2024-02-02 17:16:47 +00:00
Valentin Iftime
07695e0b29
Enable polite notifications by default for work profiles
...
Test: atest PoliteNotifWorkProfileToggleControllerTest
Bug: 323337417
Change-Id: I859b76156573e62c217c67522a0df601338ecee2
2024-02-02 17:17:25 +01:00
pajacechen
d171a8b946
[BatteryTip] Implement new CardPreference to apply new style
...
- Implement a new CardPreference to apply SettingsCard
- Apply CardPreference on battery tips
Bug: 315748218
Test: atest SettingsSpaUnitTests:com.android.settings.widget.CardPreferenceTest
Test: atest SettingsRoboTest:com.android.settings.fuelgauge
Change-Id: I9a57e7739275854278b2c586793af718b0680d23
2024-02-02 22:27:16 +08:00
pajacechen
5dd8460c3e
[BatteryTips] Separate the low battery tips
...
Bug: 315748218
Test: atest SettingsRoboTestStub:com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetectorTest
Change-Id: Id973be37012da414d6125a4dd29ec4522ab80e95
2024-02-02 22:16:58 +08:00
Yiyi Shen
d8d977d442
Merge "[Audiosharing] Fix tests when flag is on." into main
2024-02-02 10:23:53 +00:00
Yiyi Shen
769f9ae45e
[Audiosharing] Fix tests when flag is on.
...
Test: atest
Bug: 305620450
Change-Id: I85e8be4aef84a550bd4fe556848f3627b0f29fa6
2024-02-02 16:05:13 +08:00
Yiyi Shen
3b0d829152
Merge "[Audiosharing] Handle fallback device for calls and alarms." into main
2024-02-02 07:36:48 +00:00
Fan Wu
63a9d21e26
Merge "Remove redundant cast" into main
2024-02-02 06:43:24 +00:00
Aishwarya Mallampati
aab23344cb
Disable Wi-Fi calling roaming preferrence while using NTN.
...
When phone is connected to non-terrestrial network, carrier can specify
whether to override Wi-Fi calling roaming mode or not using
KEY_OVERRIDE_WFC_ROAMING_MODE_WHILE_USING_NTN_BOOL.
If KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL is false,
and if KEY_NTN_EDITABLE_WFC_ROAMING_MODE_BOOL is true and
if KEY_OVERRIDE_WFC_ROAMING_MODE_WHILE_USING_NTN_BOOL is true, then
Wi-Fi calling roaming preferrence is disabled.
Bug: 318871716
Test: atest CarrierConfigManagerTest, atest ImsManagerTest,
atest WifiCallingSettingsForSubTest
Change-Id: I95bf5e6a0f11796e67bd7e6a2c12a331481f8187
2024-02-02 06:34:18 +00:00
Yiyi Shen
e96833943a
[Audiosharing] Handle fallback device for calls and alarms.
...
Test: atest
Bug: 305620450
Change-Id: I1c7a49b6aed7d47b7fdbcc6b475b8e99edc52443
2024-02-02 13:32:50 +08:00
Joanne Chung
8541c6c4ef
Merge "Allow uninstallation of current home app" into main
2024-02-02 05:02:50 +00:00
Fan Wu
148640e72d
Remove redundant cast
...
Bug: 313569889
Test: atest
Change-Id: Idad218e3722f29063b6c357139f7120414dea09e
2024-02-02 02:35:53 +00:00
lpeter
b3e2179531
Allow uninstallation of current home app
...
Change the behavior to allow uninstallation of the current home app
if it is a non-system app and/or there are other candidate apps
available.
Bug: 131721576
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Test: atest com.android.settings.spa.app.appinfo.AppButtonRepositoryTest
Change-Id: I556966894240aaf91c0e6424dce514b6a35d1001
2024-02-01 23:57:15 +00:00