Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,489 Commits 1 Branch 0 Tags
1ceac581de9907d0f676e0eb8f201dc87cda9082
Commit Graph

47588 Commits

Author SHA1 Message Date
Jason Hsu
bfd9c0e2d0 Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e am: b6a359d888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I680ded035b514a239c95eeeaab882b42509c82ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:38:47 +00:00
Jason Hsu
7ab852b48e Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev 2023-03-15 06:25:13 +00:00
Tom Hsu
2f4e3b3041 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 am: 510b9b6b49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: Iac2042b8bfe511b51551394b7e7cd5b0cb16da17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 05:32:52 +00:00
Tom Hsu
29bcb4d553 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev 2023-03-15 04:21:02 +00:00
tom hsu
397f06abff Add Regional preference UI for Physical keyboard location. 
Bug: b/271805730
Test: Maunal test.
Test: atest passed.
Change-Id: Iab4351c158d6cf24d1a5aa1307ef0182eec522ae
 2023-03-15 12:10:21 +08:00
Lucas Silva
95d06ff9de Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 am: c1e0f6f3ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ia6d2268fb3ede33f805447fbdf8ed9c7fbd73145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:43:16 +00:00
TreeHugger Robot
e87159a591 Merge "Merge credential manager providers by package name" into udc-dev 2023-03-14 22:55:34 +00:00
Lucas Silva
d17cb44367 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ib9e3e0effc2f486a15c4caec31bdecde0f358029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 22:39:31 +00:00
Behnam Heydarshahi
8e10c8e488 Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e am: 4f3401050d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: Ia429c3c5a8520b540b542a6634316d45f5ca15d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 21:59:55 +00:00
Lucas Silva
5671ddb191 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 21:54:01 +00:00
Lucas Silva
148f1592ef Merge "Add home controls button to screensaver settings" into tm-qpr-dev 2023-03-14 21:47:03 +00:00
Becca Hughes
0e6d91b778 Merge credential manager providers by package name 
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: If7eec7d9a79a97ac3ec4f55b7cbcfaf7748d5750
Merged-In: Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928
 2023-03-14 20:28:03 +00:00
Behnam Heydarshahi
a1daad718e Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: I38f7acc1b1c5cbb08432d6e3b3229305da381379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 20:22:07 +00:00
Pavel Grafov
400ec55c09 Merge "Show work lock confirmation in a task overlay" into udc-dev am: 7d91a4916d am: c1a5e8e790 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21851695

Change-Id: Ic162d3bc8f5dc2b7dd6eeb9d45db0476468caf66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 19:51:38 +00:00
Behnam Heydarshahi
afb4dd1ece Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: I60aab9b333efc5d38f0cbc6f3635948bf734091f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 19:43:25 +00:00
Pavel Grafov
7d91a4916d Merge "Show work lock confirmation in a task overlay" into udc-dev 2023-03-14 19:41:30 +00:00
Behnam Heydarshahi
17701cd976 Merge "Extend settings panel under navigation bar" into tm-qpr-dev 2023-03-14 18:54:48 +00:00
Andreas Miko
51cb60cc7c Add setting to disable PIN animation and password am: 30bf66db42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281

Change-Id: I39f9675c5b3fc234608882780a62141061bf1e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:05:35 +00:00
Becca Hughes
dde593c363 Merge "Merge credential manager providers by package name" 2023-03-14 17:14:49 +00:00
Julia Reynolds
48d752fdc4 Merge "Don't show NLSes with excessively long component names" into udc-dev am: 4726d0de52 am: fff542b5dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888167

Change-Id: Ic3a2254d55bc7938f2ae8825ed62bf5616958073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 15:07:47 +00:00
Julia Reynolds
4726d0de52 Merge "Don't show NLSes with excessively long component names" into udc-dev 2023-03-14 14:47:55 +00:00
Matías Hernández
e148bda11a Merge "Close ZenModeScheduleRuleSettingsActivity when rule is deleted" into udc-dev am: ebde211060 am: bf2b85bf46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986562

Change-Id: Ic67427ac1e7162727b261e5308c6dcb312202bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 13:49:57 +00:00
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
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
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
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
db7e7d0920 Merge "Put Android Core Apps under System apps" into udc-dev 2023-03-14 08:14:09 +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
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
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
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
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
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
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
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
TreeHugger Robot
25b2c5a63c Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev 2023-03-13 11:51:12 +00:00
Paul Wang
eb39a6dbd5 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I7817be6bc82ac48127b00d0de8d644450a21711e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 11:35:03 +00:00
Zaiyue Xue
64965ded30 Replace stream().min() to Collections.min() to avoid stream object. 
Bug: 273175976
Fix: 273175976
Test: manual
Change-Id: I36a162443e8e275b03f804edb4fc6b421deb345d
 2023-03-13 19:06:53 +08:00
Matías Hernández
89f93a9bb1 Close ZenModeScheduleRuleSettingsActivity when rule is deleted 
This fixes an issue where the ZenRuleButtonsPreferenceController was redirecting to the rule list, but the container fragment was still trying to refresh the rule, leading to a "rule not found" toast. This also makes the transition look nicer, as it's a "back" instead of a "forward" animation now.

Fixes: 244103559
Test: Manually on phone & tablet
Change-Id: Ie26511dcaec4c7976f488936cdc6d417110ca1b1
 2023-03-13 12:03:27 +01:00
Paul Wang
d4fbc38279 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I2ba651e080ca1f054ff03d3d125848031ced4e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:58:14 +00:00
TreeHugger Robot
c21d06d8e0 Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e am: 7db8aed96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

Change-Id: I1f47e62f2673d76f7c9444cb37cf0ea55ebb039c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:40:11 +00:00
Jason Hsu
977a6bf0fa Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 am: 13c960629b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

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

Change-Id: I231847656a260eff43204306faf8c3908c9fc8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:22:11 +00:00
TreeHugger Robot
85ca6e6a5e Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev 2023-03-13 10:15:36 +00:00