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

121008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Xin Li
dc399ade52 [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I35578d54aa72f7abf031eba8873a14e4ccf9a54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 22:35:18 +00:00
Xin Li
d19379e607 [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: Ideb892316ec21740723c3d5f06a1b3904f34c3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 22:32:04 +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
Xin Li
19ca5d6a6e Merge "Merge Android 13 QPR2" 2023-03-14 21:40:40 +00:00
Behnam Heydarshahi
3135bc59e0 Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: I560471fe2df61a2e83d39f0d8e32f1bbfc11cba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 21:26:44 +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
c1a5e8e790 Merge "Show work lock confirmation in a task overlay" into udc-dev am: 7d91a4916d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21851695

Change-Id: I2c9b00b9e82001b49a8b52e7178baca6ce7d9995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 19:47:55 +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
19191a0a0b [automerger skipped] Add setting to disable PIN animation and password am: 30bf66db42 am: 51cb60cc7c -s ours am: dc03dfc013 -s ours 
am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 387b788b19 is already in history

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

Change-Id: I7c64b776cf2bd63f6c9686e6a9e45af516049f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:16:46 +00:00
Andreas Miko
dc03dfc013 [automerger skipped] Add setting to disable PIN animation and password am: 30bf66db42 am: 51cb60cc7c -s ours 
am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 387b788b19 is already in history

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

Change-Id: I24d4c99e04622a89a8203d8572f0cfcce963d0f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:08:17 +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
Matías Hernández
61087cda06 Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev am: 239176684e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986572

Change-Id: I1d8888bdb05699472f6a4ef15cdbd544f7ae776f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:11:08 +00:00
Matías Hernández
239176684e Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev 2023-03-14 16:57:58 +00:00
Matías Hernández
0882b04ed5 Delete stuff related to removed "Conversations that can interrupt" settings 
Bug: 226486181
Test: N/A, dead code removal only
Change-Id: I100db518880a7eee402af37f49e416ec61ff8486
 2023-03-14 16:53:53 +01:00
Julia Reynolds
fff542b5dc Merge "Don't show NLSes with excessively long component names" into udc-dev am: 4726d0de52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888167

Change-Id: Ic20efe366e48e6132dca9a932156281304661f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 14:49:44 +00:00
Julia Reynolds
a9ccc96efd Don't show NLSes with excessively long component names 
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-14 14:48:29 +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
77c0dd9469 Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev am: 55a91dda13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986564

Change-Id: I8b76b13b3db3451825bad5c43114cdaec3583b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 13:17:12 +00:00
Matías Hernández
bf2b85bf46 Merge "Close ZenModeScheduleRuleSettingsActivity when rule is deleted" into udc-dev am: ebde211060 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986562

Change-Id: I6729ad74bcc597ef8bbb18b5c13c1c5dfda5f227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 13:16:37 +00:00
Matías Hernández
55a91dda13 Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev 2023-03-14 12:46:49 +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
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
Chaohui Wang
4b964aa552 Move LogEvent action to Settings 
Spa cannot refer SettingsEnums, move the action to Settings.

Bug: 269821172
Test: Make Settings
Change-Id: I033f4d046736b109de679e139caac75b3e4071b1
 2023-03-14 16:46:47 +08: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
Xin Li
d15a2d7e0c Merge Android 13 QPR2 
Bug: 273316506
Merged-In: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
Change-Id: I31663f525e4d6739bf511d0a47cfe69d22feeccb
 2023-03-13 23:11:28 -07: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
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
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
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
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