PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,767 Commits 1 Branch 0 Tags
c82275d5fc7a9468ca3c0dbf28a7f982795376ab
Commit Graph

120767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
db7e7d0920 Merge "Put Android Core Apps under System apps" into udc-dev 2023-03-14 08:14:09 +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
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
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
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
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
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
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
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
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
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
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
Jason Hsu
13c960629b Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

Change-Id: Ibaa6b0372a74f0ad07a3f7a3dce0a26c9f6cdf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:05:55 +00:00
Paul Wang
dd3d813ff3 Merge "Avoid disabling LE Audio when BT is off" 2023-03-13 09:55:49 +00:00
Jason Hsu
de202d5307 Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev 2023-03-13 09:34:58 +00:00
Candice Lo
151ffe1ea7 [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours am: b64632bcf7 -s ours 
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2 is already in history

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

Change-Id: I45626763f82479e0a953abad549ed62af73b562b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 08:36:07 +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
b64632bcf7 [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours 
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2 is already in history

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

Change-Id: Ib94406415a0913a62c1a93a4a3ab56b25543950e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 07:57:53 +00: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
bee78a3d59 Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f am: 3a4c6feb0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: Ieaf430842a766ff697b5de93bf4ed24db05186ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 02:00:12 +00: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
Bill Yi
869cd2a572 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +00:00
Bill Yi
fa0cc20b94 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +00:00
Bill Yi
8fe591389b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +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
adb043c201 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

Change-Id: I172f16edeaabf7374f9a77cd67daf0ac5808a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:55:54 +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
2f6bb387f0 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I5b3920550c231799afcc28c7aeb3150712bd57a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:57:53 +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