Commit Graph

121458 Commits

Author SHA1 Message Date
Matías Hernández
ebde211060 Merge "Close ZenModeScheduleRuleSettingsActivity when rule is deleted" into udc-dev 2023-03-14 12:46:38 +00:00
Neil Fuller
e03e729d14 Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev am: 3e34c99502 am: 13c40b99b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21958502

Change-Id: I01fa6da0d849b294cf1127eeab9bd14021c51fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 11:05:32 +00:00
Neil Fuller
c762f5243e Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev am: 3e34c99502 am: c82275d5fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21958502

Change-Id: Ib90f62226612355b589a869a4da0bfe47ebb6b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 11:03:46 +00:00
Neil Fuller
13c40b99b1 Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev am: 3e34c99502
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21958502

Change-Id: I50f9dfb65074976ca9b3ae35cae61abc4bcd7d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 10:30:41 +00:00
Neil Fuller
c82275d5fc Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev am: 3e34c99502
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21958502

Change-Id: I2dea6950d3a19a2b60d99a8b08800316ccc1768c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 10:29:44 +00:00
Neil Fuller
3e34c99502 Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev 2023-03-14 09:50:45 +00:00
TreeHugger Robot
8186ddade1 Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920 am: 5240e16556
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043

Change-Id: I608635dc7efa111cbf84ebab460feed91126050b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 09:15:15 +00:00
TreeHugger Robot
6650ee11cc Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920 am: 19aee83def
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043

Change-Id: I5e0791ccb1a3857b6b9bea875055521c3af10880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 09:13:45 +00:00
TreeHugger Robot
19aee83def Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043

Change-Id: I67456274cd18c338c87b9ab560e3e0e0b918ae7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 08:41:53 +00:00
TreeHugger Robot
5240e16556 Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043

Change-Id: Iea678ce10300088b6141bce4a69092a62b44637c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 08:41:49 +00:00
TreeHugger Robot
db7e7d0920 Merge "Put Android Core Apps under System apps" into udc-dev 2023-03-14 08:14:09 +00:00
Zaiyue Xue
a038241c96 Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev am: ae45b5812b am: 22016f28d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21987933

Change-Id: I0f7e933c3e9faffe4eb65bbf9082a507aa44e88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 08:04:11 +00:00
Milton Wu
238daf4979 Merge "Add biometrics v2 test" into udc-dev am: ea3c207e6f am: 4a44ba19f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983046

Change-Id: I06ebfd4208bbcf5d7625769297f1e01346bc72ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 08:04:00 +00:00
Zaiyue Xue
3d012059d5 Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev am: ae45b5812b am: 7eeace0d2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21987933

Change-Id: I3b19e536ab231fc94ec7757e72506a9c93f3aa78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 08:03:47 +00:00
Milton Wu
d3a1030f22 Merge "Add biometrics v2 test" into udc-dev am: ea3c207e6f am: b0b739a188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983046

Change-Id: I9825613ac388bc9557a1c08542da4f6d8df87fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 08:03:34 +00:00
Zaiyue Xue
7eeace0d2b Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev am: ae45b5812b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21987933

Change-Id: I0e68832a8e10baca409001c83d046821eb60dae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 07:30:25 +00:00
Zaiyue Xue
22016f28d1 Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev am: ae45b5812b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21987933

Change-Id: I6d18a75d568c5b08efdc9212a4c66b9409f15d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 07:30:25 +00:00
Milton Wu
4a44ba19f0 Merge "Add biometrics v2 test" into udc-dev am: ea3c207e6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983046

Change-Id: Ia9dfb1abbc6601fdc00f4ad3d4ff1902deb394ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 07:29:54 +00:00
Milton Wu
b0b739a188 Merge "Add biometrics v2 test" into udc-dev am: ea3c207e6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983046

Change-Id: I927ebd7f4c987994047c702922a70d0576975cf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 07:29:48 +00:00
Zaiyue Xue
ae45b5812b Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev 2023-03-14 07:08:40 +00:00
Milton Wu
ea3c207e6f Merge "Add biometrics v2 test" into udc-dev 2023-03-14 06:53:16 +00:00
TreeHugger Robot
e721532a36 Merge "Update the font family for panel slice" into udc-dev am: ea58698850 am: 00cd454f6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21938303

Change-Id: I85b452c7af60879eb0fb5c91b69ebbfa618ab9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 06:16:15 +00:00
TreeHugger Robot
e2dff8c3ea Merge "Update the font family for panel slice" into udc-dev am: ea58698850 am: a3a473746c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21938303

Change-Id: Idc55fa197bdccfc26902fac841a62160200259cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 06:14:37 +00:00
Zaiyue Xue
702921c9ff Put Android Core Apps under System apps
Bug: 269188405
Fix: 269188405
Test: manual
Change-Id: Ie79cdb71c48661b6b1e90b8d0e7836269cf665e7
2023-03-14 13:53:08 +08:00
Zaiyue Xue
f57ae783f3 Change getSystemAppsAllowlist() returns an empty list instead of null.
Bug: 265751163
Test: presubmit
Change-Id: Ide8b36345b328d5969b764b6c5e1503904e9ecaf
2023-03-14 13:45:48 +08:00
TreeHugger Robot
a3a473746c Merge "Update the font family for panel slice" into udc-dev am: ea58698850
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21938303

Change-Id: Ic67a59a8d87994579875d0721fa90d1016c8605e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 05:42:05 +00:00
TreeHugger Robot
00cd454f6c Merge "Update the font family for panel slice" into udc-dev am: ea58698850
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21938303

Change-Id: If366fb5a2b3840e14308d48c534b392c33291a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 05:41:52 +00:00
TreeHugger Robot
ea58698850 Merge "Update the font family for panel slice" into udc-dev 2023-03-14 05:09:55 +00:00
Milton Wu
ab488b3c5b Add biometrics v2 test
Add tests into FingerprintEnrollFinishViewModelTest and
FingerprintEnrollProgressViewModelTest. and also remove mDoneLiveData
from FingerprintEnrollProgressViewModel because no one uses it.

Bug: 271220339
Test: atest FingerprintEnrollFinishViewModelTest
      FingerprintEnrollProgressViewModelTest
Change-Id: Id74da29b7730a3e7feb8d0b263c28c8192adad9c
2023-03-14 04:33:12 +00:00
Andreas Miko
30bf66db42 Add setting to disable PIN animation and password
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Merged-In: I587b993ef5515a075442e82ebafae88bebdffc20
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-03-14 02:27:51 +00:00
Becca Hughes
043ba28892 Merge credential manager providers by package name
**This is a merge to master from udc-dev**

As part of the spec'd design we should merge providers
by package name this means that if there are multiple
providers they will be all turned on/off together.

Bug: 266772233
Test: make & atest
Change-Id: Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928
2023-03-13 22:35:58 +00:00
TreeHugger Robot
3b3609c544 Merge "Update incompatible charging string for different product" into udc-dev am: 36d78f8fe0 am: 9550f8b0fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988525

Change-Id: I5a576e80ea56696b70142604ed25c80046b0cf00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 19:23:33 +00:00
TreeHugger Robot
1143832aca Merge "Update incompatible charging string for different product" into udc-dev am: 36d78f8fe0 am: 56c868f611
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988525

Change-Id: I33fe08ec56e75b5bd67fb3be457043094d88e6c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 19:22:27 +00:00
TreeHugger Robot
56c868f611 Merge "Update incompatible charging string for different product" into udc-dev am: 36d78f8fe0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988525

Change-Id: I550e308c0f8317dab5495c531d89fd35f9d8d477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 18:47:23 +00:00
TreeHugger Robot
9550f8b0fc Merge "Update incompatible charging string for different product" into udc-dev am: 36d78f8fe0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988525

Change-Id: If1abf6420e3beaf6839850a38ea770df9b4bb5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 18:46:51 +00:00
TreeHugger Robot
36d78f8fe0 Merge "Update incompatible charging string for different product" into udc-dev 2023-03-13 18:08:13 +00:00
YK Hung
b064fe4ee9 Merge "Replace stream().min() to Collections.min() to avoid stream object." into udc-dev am: 2d53aabf74 am: 195fba4c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983045

Change-Id: Ic1befde8673e65156d74b8b77900599a758131fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 16:59:12 +00:00
YK Hung
569e402730 Merge "Replace stream().min() to Collections.min() to avoid stream object." into udc-dev am: 2d53aabf74 am: 7bdee8e623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983045

Change-Id: I81bd5212c56261f09c3b0840efde29b24e1e976c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 16:58:28 +00:00
ykhung
28e22dd726 Update incompatible charging string for different product
Bug: 271775549
Test: presubmit
Change-Id: Iec7b91b2bcb018f51127b54e500be9c53d75515b
2023-03-14 00:49:08 +08:00
YK Hung
7bdee8e623 Merge "Replace stream().min() to Collections.min() to avoid stream object." into udc-dev am: 2d53aabf74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983045

Change-Id: I422e24035792ca3f524c4eb94996b13f23b14e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 16:11:58 +00:00
YK Hung
195fba4c28 Merge "Replace stream().min() to Collections.min() to avoid stream object." into udc-dev am: 2d53aabf74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983045

Change-Id: I3588d288329462658977e069448dfccf57d51f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 16:10:42 +00:00
YK Hung
2d53aabf74 Merge "Replace stream().min() to Collections.min() to avoid stream object." into udc-dev 2023-03-13 15:25:15 +00:00
Pavel Grafov
e5d082b0dc Show work lock confirmation in a task overlay
WorkLockActivity is added on top of each task that has any work
activity when the profile is locked. This activity is a task
overlay meaning it stays on top of other activities. It then starts
ConfirmDeviceCredentialActivity, also as an overlay because
otherwise it will sink under WorkLockActivity. But when CDCA
launches CofirmLockPattern, it is not set as an overlay and as a
result is not visible. These CLs add a boolean extra to instruct
CDCA to launch CLP (or other activities) as an overlay.

Bug: 271840143
Bug: 234002331
Test: manual, with TestDPC setting password reset token.
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: Ie9b593696a24ad0c435b36eef80e3fe760c588ba
2023-03-13 14:49:57 +00:00
Matías Hernández
23d25dde02 Show correct chevron for "Priority" on RTL languages
Fixes: 232397646
Test: N/A
Change-Id: I3b653163a66fcd0b6fa80895495d039f53c934f0
2023-03-13 14:49:29 +01:00
Automerger Merge Worker
b981e3ae7b Merge "Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c am: 392cd4be96" 2023-03-13 12:49:08 +00:00
TreeHugger Robot
4d72aa5cba Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c am: 392cd4be96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

Change-Id: I023b300a1d5f222bf51dc0218c1adcf3b5006c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 12:49:03 +00:00
TreeHugger Robot
47fba2caf5 Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c am: de6666f95b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

Change-Id: I6c76de4e9ad67db977159b84ba5e779f786a7a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 12:49:01 +00:00
Automerger Merge Worker
4de41901fb Merge "Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 am: eb39a6dbd5 am: 909f5335d7" 2023-03-13 12:47:54 +00:00
Paul Wang
5739d79de8 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 am: eb39a6dbd5 am: 909f5335d7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: Ie1715219f22b71e8c9bea8ee5a44b1e4283581cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 12:47:44 +00:00
Paul Wang
c071a30ef3 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 am: eb39a6dbd5 am: 553a0dd2da
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: Iba441d1e54e61caaaed3d9aa3b4be02031adb0ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 12:47:40 +00:00