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
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
ebde211060
Merge "Close ZenModeScheduleRuleSettingsActivity when rule is deleted" into udc-dev
2023-03-14 12:46:38 +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
db7e7d0920
Merge "Put Android Core Apps under System apps" into udc-dev
2023-03-14 08:14:09 +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
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
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
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
Paul Wang
dd3d813ff3
Merge "Avoid disabling LE Audio when BT is off"
2023-03-13 09:55:49 +00:00
Zoey Chen
63978e7e52
[Settings] 1. Show default subId SIM page if get an intent with invalid
...
subId 2. Fix the hotswap UI issue
Bug: 271635200
Bug: 271347499
Test: local test
Change-Id: Iac61a211fce7bcd85da48cb291f46584cf43f5c5
2023-03-13 08:12:20 +00:00
Zaiyue Xue
a528f1e382
Fix b/273175976: Screen time counts the time before full charge.
...
Use the raw start timestamp instead of the first timestamp in the level
map to query app usage time.
Bug: 273175976
Fix: 273175976
Test: manual
Change-Id: Idb43b2bd5378e2f34ec722354408754f4a439c6d
2023-03-13 15:59:05 +08:00
Candice Lo
934beb4127
Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21791725
Change-Id: I0b61473ac3ef0a91e2ed901d7b2deb1e35268866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 07:22:21 +00:00
Candice Lo
91eab671d1
Merge "Set the settings key when the font size is changed" into tm-qpr-dev
2023-03-13 06:51:27 +00:00
jasonwshsu
2bf80d8bf2
The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture.
...
Root Cause: Did not update dialog when user back to previous page.
Solution: Merge the solution in ToggleFeaturePreferenceFragment.java
Bug: 263451053
Test: manual test
Change-Id: I99513fa70cf44b32a0fb78a5f953e41373e086f4
2023-03-12 20:47:25 +08:00
Diya Bera
3a4c6feb0a
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
am: 9a93c8a00f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: I27b79bf6dcc69e42ea3af7f5b1274173676996fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 01:14:57 +00:00
Diya Bera
9a93c8a00f
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: Iddfaa9baa18e16d3b1f5e06de88d74faf208c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 23:26:58 +00:00
Diya Bera
9777ea2fdf
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev
2023-03-10 21:11:09 +00:00
Vania Januar
76452f3a1f
Merge "Show single icon layout for unknown device type in advanced header." into udc-dev
2023-03-10 18:15:37 +00:00
Treehugger Robot
a38c972ef0
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
am: c8a58a249d
am: 3c62dd3543
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: If51239c47ffc2ebf9c80ce5b8f2e27d8b187a871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 17:04:09 +00:00
Treehugger Robot
3c62dd3543
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
am: c8a58a249d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: I8ec06e45f02f48bfec30051159ed8a931a11e2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 16:27:37 +00:00
Treehugger Robot
c8a58a249d
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: I76493ccb15ff2d58045061ef4c62b20f772aab30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 15:53:41 +00:00
Treehugger Robot
821e70ea59
Merge "Adb is disconnecting during Monkey Test Run."
2023-03-10 15:19:15 +00:00
Neil Fuller
7ddbef73f0
Fix a crash due to absence of no-arg fragment init
...
Fix a crash due to absence of no-arg fragment constructor.
e.g. if the dialog were shown and the device were rotated, the dialog
could not be restored.
Bug: 272439218
Test: Manual with repro steps before and after
Change-Id: Idca052acff709af132fa72f7919aa71fe8060595
2023-03-10 15:16:05 +00:00
Marcelo Arteiro
7e2d77a717
Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev
2023-03-10 13:43:23 +00:00
Junyu Lai
3eb30fb31c
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
am: 0da4abe1db
am: 4beef2e82e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: I7323a6fbd1e8f7595fdb7c29e7520cff5ac12a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 10:48:49 +00:00
Junyu Lai
4beef2e82e
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
am: 0da4abe1db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: Ia79b5f286b4269c38fc3a2fa990615251694a020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 10:12:13 +00:00
Junyu Lai
0da4abe1db
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: I3e55fc5496918d8e2d0c230df74b62e1e6847fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 09:37:20 +00:00
Junyu Lai
ae267bae74
Merge "Do not crash when duplication found in merged imsi list"
2023-03-10 09:01:44 +00:00
Ting-Kang Chang
d31de7593e
Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev
2023-03-10 02:32:59 +00:00
Marcelo Arteiro
1b599e0232
Revert "Automated Token Alignment Android/Material"
...
This reverts commit c9ca4a9014
.
Reason for revert: Black Search Box in Settings App (Light Theme)
Change-Id: I936e977ce044b8da41d818d6b3392adc6fd1e4e6
2023-03-09 23:40:40 +00:00
Dmitry Dementyev
18df885c94
Merge "Use updated lockscreen validation API in Settings." into udc-dev
2023-03-09 22:15:43 +00:00
Weng Su
bcca5ebf1a
Add "Speed & compatibility" preference to Wi-Fi hotspot Settings
...
- Show 4 speed types in summary
- 2.4 Ghz
- 5 Ghz
- 2.4 and 5 GHz
- 6 GHz
Bug: 245258763
Test: manual test
atest -c WifiTetherViewModelTest
atest -c WifiHotspotRepositoryTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: I6deb41cb355b0ceb1f1fd2d84408a83b90433e7d
2023-03-09 20:06:37 +08:00
Vania Januar
ebf06975e3
Merge "Remove battery event time detection from StylusUpdater." into udc-dev
2023-03-09 10:32:51 +00:00
Junyu Lai
8005bc8f5b
Do not crash when duplication found in merged imsi list
...
For some unknown reason, the merged imsi list might contain
duplicated items. Deduplication for better error handling.
Test: make RunSettingsRoboTests
Fix: 271298466
Change-Id: I3cbe8f9441769963a16720fc5128db173fa0868b
2023-03-09 16:55:35 +08:00
Justin Ghan
037eda8910
Merge "Support stylus handwriting in settings search bar" into udc-dev
2023-03-09 07:02:58 +00:00
Ting-Kang Chang
ec90572f75
Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating.
...
Bug: 271665638
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I1c9cc3cfcb54051223df2ad46947d7f0c1ebbdb0
2023-03-09 13:22:53 +08:00
Ankita Vyas
f9c62f2275
Merge "Display toast for clone app creation and completion in App Info page." into udc-dev
2023-03-09 05:10:55 +00:00
Diya Bera
8ceded494f
Remove subtext when enrollment stage changes
...
Bug: 272145668
Test: Manual (Try enrolling fingerprint in UDFPS, the subtext should
disappear when lottie asset is introduced)
Change-Id: I912ff2b32644d05cc189105ae1679fa14b04a1ef
2023-03-08 23:00:47 +00:00
Yu-Ting Tseng
0f90688ede
Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f
am: 11ab38f690
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083
Change-Id: Ic12845f37d61bd197c3c7eaeecf742aac572947b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 22:49:49 +00:00
Yu-Ting Tseng
11ab38f690
Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083
Change-Id: I995d75f9a0cf98b329f0de672a7677307a434695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 22:17:51 +00:00