Commit Graph

138799 Commits

Author SHA1 Message Date
Xin Li
32cdca80cc Merge "Merge Android 14 QPR1" into main 2023-12-09 00:11:59 +00:00
Xin Li
784b56d43f Merge Android 14 QPR1
Merged-In: I22fa193e9846fdb998810c93c9c26344a40d89a9
Bug: 315507370
Change-Id: I4a3a51affce75afe081a0cc9197e0034e34fe82d
2023-12-08 13:14:21 -08:00
Joshua Mccloskey
4ed5548887 Merge "Fixed biometric setting crash." into main 2023-12-08 20:22:59 +00:00
Chaohui Wang
c69eb48807 Add HideNonSystemOverlayMixin for SpaActivity
Fix: 315473158
Test: manual - try overlay on SpaActivity
Change-Id: I67f30f6aa0adb22f891683a6d603fb6cb146b4f1
2023-12-09 00:08:17 +08:00
Johannes Gallmann
af96028267 Add predictive back aconfig flag
Bug: 309545085
Flag: ACONFIG com.android.window.flags.predictive_back_system_animations DISABLED
Test: atest BackAnimationPreferenceControllerTest; Manual, i.e. building and verifying correct behaviour for different flag configurations
Change-Id: I3f478dc23bbfeb1f13cae64f3d04b3210841731d
2023-12-08 13:37:25 +00:00
Anubhav Kakkar
6bc92efaae Merge "Add activity to handle app specific request to open media routing controll special" into main 2023-12-08 12:35:27 +00:00
Jakob Schneider
b842ce9d4b Change the strings on the opt-out toggle to also account for archiving.
These have been confirmed over email by UX & PMs

Test: N/A
Bug: 304257274
Change-Id: I47634e56ccb3ebaa122176c83805cd0802debc08
2023-12-08 12:08:11 +00:00
Mark Kim
d17b1a3816 Merge "Add 'Archive' button to AppInfo screen" into main 2023-12-08 10:25:58 +00:00
Chelsea Hao
920037db83 Merge "[Audiosharing] Implement add source by qrcode scan" into main 2023-12-08 09:43:39 +00:00
Yiyi Shen
ab3136a51d [Audiosharing] Add prefix to device list item text in adapter.
Bug: 305620450
Test: atest
Change-Id: Icd8f7032d9bcf1be133d6b3f4c165ca98e0dfa60
2023-12-08 17:07:34 +08:00
Anubhav Kakkar
e79fcbef78 Add activity to handle app specific request to open media routing controll special
Bug: 313775893
Test: Trigger the intent with action "android.settings.REQUEST_MEDIA_ROUTING_CONTROL" and package name in the data uri
Change-Id: If65ea61a058b465dc44836eff9c7d3fb25425ec4
2023-12-08 08:52:44 +00:00
Xin Li
af57916bb1 [automerger skipped] Merge UQ1A.231205.015 am: 4f1ec8cb8a -s ours am: e72aefc106 -s ours
am skip reason: Merged-In I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c with SHA-1 fdf80bd5c9 is already in history

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

Change-Id: Id02614b3bfb1fb9d42ab5279c3a4611f62fe30c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:06 +00:00
Yiyi Shen
79028d1c8f Merge "[Audiosharing] Refine sharing disconnect dialog." into main 2023-12-08 08:24:07 +00:00
Yiyi Shen
90844f3546 Merge "[Audiosharing] Refine sharing stop dialog." into main 2023-12-08 08:23:39 +00:00
Xin Li
e72aefc106 [automerger skipped] Merge UQ1A.231205.015 am: 4f1ec8cb8a -s ours
am skip reason: Merged-In I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c with SHA-1 fdf80bd5c9 is already in history

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

Change-Id: I8326d3adfea2de2f71271b65f4673bf9dc251125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:19 +00:00
Yiyi Shen
f8ccd2bda3 Merge "[Audiosharing] Refine main sharing dialog." into main 2023-12-08 08:13:24 +00:00
Yiyi Shen
4d130705c7 [Audiosharing] Refine sharing stop dialog.
Bug: 305620450
Test: atest AudioSharingStopDialogFragmentTest
Change-Id: I1593d1b18af23ffea0ccae0425ad848191b90e8b
2023-12-08 07:17:57 +00:00
Yiyi Shen
13d09c97b2 [Audiosharing] Refine main sharing dialog.
Bug: 305620450
Test: atest AudioSharingDialogFragmentTest
Change-Id: Icd9d7524b29bc3a37f27316107176b93510cc12c
2023-12-08 14:54:41 +08:00
Yiyi Shen
16b78546a1 [Audiosharing] Refine sharing disconnect dialog.
Bug: 305620450
Test: atest AudioSharingDisconnectDialogFragmentTest
Change-Id: I16507fc5424fcb4bfa977199e92f9728c5df69c6
2023-12-08 14:27:36 +08:00
Yiyi Shen
eeec2a708c Merge "[Audiosharing] Refine sharing join dialog." into main 2023-12-08 06:19:35 +00:00
Milton Wu
eacde88922 Merge "Refine UdfpsEnrollCalibration" into main 2023-12-08 05:41:44 +00:00
Yiyi Shen
fb617e423e [Audiosharing] Refine sharing join dialog.
Bug: 305620450
Test: atest AudioSharingJoinDialogFragmentTest
Change-Id: I54001d254d5cfd0cd72ea1a115d71142b6e6ed47
2023-12-08 13:14:23 +08:00
Chaohui Wang
5e3472b5c0 Merge "Fix flaky of AppInstallerInfoPreferenceTest" into main 2023-12-08 05:03:48 +00:00
Charlotte Lu
18808379ed Merge "Telephony Issue: Apn config mmsc should start with http but is 啊." into main 2023-12-08 04:31:07 +00:00
chelseahao
541dac155a [Audiosharing] Implement add source by qrcode scan
Bug: 305620450
Test: manual
Change-Id: If09522b515649621000208285340736abba04b4d
2023-12-08 04:25:04 +00:00
Treehugger Robot
961f299c4c Merge "Ignore failing test of BluetoothUpdateWorkerTest" into main 2023-12-08 04:10:14 +00:00
Yanting Yang
033263b858 Ignore failing test of BluetoothUpdateWorkerTest
Bug: 315399487
Test: post-submit
Change-Id: I2747b45e60b7aa4d1326e8eb01bc2af8e8666030
2023-12-08 03:11:01 +00:00
Chelsea Hao
96e7c8fb96 Merge "[Audiosharing] Implement source add and remove." into main 2023-12-08 03:05:44 +00:00
Jean Chen
097d8a891b feat(MultiFingerMultiTap): Update shortcut string to double tap from triple tap
Bug: 315264770
Test: manual
Change-Id: I1130271d06bac71f23a137c83149ee3363a1cc0e
2023-12-08 10:12:43 +08:00
Xin Li
4f1ec8cb8a Merge UQ1A.231205.015
Bug: 308969284
Merged-In: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
Change-Id: I22fa193e9846fdb998810c93c9c26344a40d89a9
2023-12-07 15:48:03 -08:00
Hani Kazmi
14f38ba36c Merge "Update Special App Access Compose Components for ECM" into main 2023-12-07 23:35:26 +00:00
Joseph Vincent
e6b9290a0e Merge "Update private space setup string and loading screen title" into main 2023-12-07 22:16:19 +00:00
Joshua McCloskey
a900c1dd1b Fixed biometric setting crash.
Test: Verified test crashed without fix, and passed with fix
Test: atest FingerprintSettingsFragmentTest
Fixes: 315164185
Change-Id: I1d8ab32eef8578a6d35831aef46275a9732e497c
2023-12-07 22:12:44 +00:00
Mark Kim
63f48ad2c6 Add 'Archive' button to AppInfo screen
Disable 'Archive' button whenever 'Uninstall' button is disabled.

Test: AppArchiveButtonTest, AppButtonsTest

Bug: 304256700
Change-Id: I9671905eca2cb71a5bf30bf29be83e5305a48ef4
2023-12-07 20:21:40 +00:00
Hani Kazmi
05f85914d8 Enable ECM restrictions for Usage Access and Device Admin
This commit continues the work to make all special app access
permissions ECM restrictable. Some implementation notes:

1. The FilterTouchesSwitchPreference and AppSwitchPrefernce components
   are replaced with RestrictedSwitchPreference. afaict this is a
   superset - it still filters out obscured touches and shows the app
   icon.

2. I'm treating this as mostly a refactoring, and so do not have a
   feature flag around most of the changes. Enabling ECM for them /is/
   behind the feature flag in RestrictedLockUtilsInternal.

3. app_ops_permissions_details.xml is currently only used by
   UsageAccessDetails.

Bug: 297372999
Test: Manually tested on device. Automated tests to follow
Change-Id: I65fe7ec099582de19192a77ad2e41c1558761502
2023-12-07 15:59:52 +00:00
Hani Kazmi
ded1cd59c9 Update existing ECM settings to use new infrastructure
1. Update Notification Listener and A11y settings to call
   RestrictedLockUtilsInternal rather than checking appOp themselves

2. Rename ecm related methods to include Ecm rather than AppOp -
   implementation details are being moved to permissions module and may
   change.

Bug: 297372999
Test: Manually tested on device. Automaated tests to follow
Change-Id: Ie3e16b502993b21a7e34eab0d661f98814b3cfd5
2023-12-07 15:59:52 +00:00
Hani Kazmi
291e6043bf Update Special App Access Compose Components for ECM
This is the first in a series of changes to wire up all app settings to
be ECM restrictable. We introduce a new method in
RestrictedLockUtilsInternal which determines whether or not a setting is
restricted based on a passed in key. It currently duplicates the current
implementation, but will eventually be replaced by a call to permissions
mainline.

The settings under SpaPrivileged are then updated to have a new
BlockedByEcm which is decided by the RestrictedLockUtilsInternal call.

Bug: 297372999
Test: Manually tested on device. Automaated tests to follow
Change-Id: Ic295bdb41270b0f18f2ba3dffdffc062d532cabe
2023-12-07 15:59:52 +00:00
Chaohui Wang
176a5727ff Fix flaky of AppInstallerInfoPreferenceTest
Bug: 288353352
Test: unit test
Change-Id: Iaf500bd9f3428914d5a35d69f1bf4f3a57d511b4
2023-12-07 14:15:21 +00:00
Manish Singh
62702e3c47 Merge "Make the order of tabs same as profile creation" into main 2023-12-07 13:26:19 +00:00
Yanting Yang
1bae4c830e Merge "Ignore failing tests of com.android.settings.deviceinfo.batteryinfo" into main 2023-12-07 12:53:04 +00:00
josephpv
992f6b97dd Update private space setup string and loading screen title
This includes below changes based on the updated UX mocks:
- Add one more loading screen in setup flow
- Update feature intro text on Setup page
- To swap order of bullets on the setup intro screen
- Update "Private Space" to "private space" in setup flow screens

go/ss/7pVGBSPqezDek47.png
go/ss/ADLX8aXAAGgYQHD.png
go/ss/tYtrGypBgRuXM9V.png
go/ss/3zZfij6JDpudwYR.png
go/ss/BFtWegFZyTueQoT.png
Recording link - b/313654776#comment5

Bug: 313654776, 313882412, 313655290
Test: Verify title and text is same as UX flow
Change-Id: I6a985c4fd6ecbe8ddd11e36bf76a2a9cc8427ef5
2023-12-07 12:39:56 +00:00
chelseahao
b5cc84af39 [Audiosharing] Implement source add and remove.
Bug: 305620450
Test: manual
Change-Id: I0fdae9823f8673180755eb895ee3a664b2978328
2023-12-07 20:19:02 +08:00
Anubhav Kakkar
86b5a0afc1 Merge "Implement special app access settings for MEDIA_ROUTING_CONTROL app-op." into main 2023-12-07 10:58:40 +00:00
Yiyi Shen
57fe15ae51 Merge "[Audiosharing] Add sharing dialogs custom title layout." into main 2023-12-07 10:41:06 +00:00
Yiyi Shen
cb60abd00d Merge "[Audiosharing] Add rounded ripple for sharing dialogs." into main 2023-12-07 10:40:38 +00:00
Yiyi Shen
4b06129dd5 [Audiosharing] Add rounded ripple for sharing dialogs.
Bug: 305620450
Test: manual
Change-Id: Ie6c6dc197805edccba6a4cd3ae233351c6c4c65a
2023-12-07 17:14:58 +08:00
Yanting Yang
5aff1ee1cd Merge "Revert^2 "Ignore failing test cases in BatterTipsCardPreferenceTest"" into main 2023-12-07 09:12:42 +00:00
Anubhav Kakkar
642bc5a6bc Implement special app access settings for MEDIA_ROUTING_CONTROL app-op.
Bug: b/307632045
Test: Pair a watch with companion app > Settings > Apps > Special app access > enter "Change Media Output" > Find the companion app > Ensure the special app access is Allowed > ensure companion app is able to call remote media routing APIs > come back to the settings > revoke the access > ensure that now companion app is NOT able to call the remote media routing APIs.

Change-Id: I35487660365ef05f3b998e8ecf13aaed7ba844a9
2023-12-07 09:12:08 +00:00
Yiyi Shen
e9004b718d [Audiosharing] Add sharing dialogs custom title layout.
Bug: 305620450
Test: manual
Change-Id: I3e27812613e35228acadc0fdb99ae50fdf38e834
2023-12-07 17:11:49 +08:00
Yanting Yang
53fa7d2891 Ignore failing tests of com.android.settings.deviceinfo.batteryinfo
Bug: 315267179
Test: post-submit
Change-Id: Ib209068325e4716026e4a9894f5e79ca15855aea
2023-12-07 09:10:37 +00:00