PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,386 Commits 1 Branch 0 Tags
a038241c96d15deb99ecd68b17faca3fb6fcbe2a
Commit Graph

121386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
TreeHugger Robot
392cd4be96 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

Change-Id: I4dc8aa7aa34749795ee5341bbd92b2c8b50e4d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:13:21 +00:00
TreeHugger Robot
de6666f95b 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

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

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

Change-Id: I3c87c1030ed7d9af51e05cabf909509dc8628506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:12:49 +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
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
22ab6c2735 Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e am: 2a28840820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

Change-Id: I3b34ef7587fe6fa99f01854bcaed4098b8848c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:41:32 +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
fdc203d5a6 Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 am: c25e248a66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

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

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

Change-Id: I16f465c28dd7638ab0f380ec31c3e05eaf07ef54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:23:33 +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