PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,361 Commits 1 Branch 0 Tags
8f0b2d15c6ac396ad4fb7c19b321efbf222005df
Commit Graph

131361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Taran Singh
6484a7f640 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: 4a5e1a4d3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I444194ab1c57d376de954f3cbed4ba3d3b0cb3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 21:12:56 +00:00
Treehugger Robot
a2fffae315 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857 am: 48b541abfb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c887402cf34c8965127e481b321118fc8546e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 21:12:56 +00:00
Taran Singh
481776a78e [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: feea08e693 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11f4e10382ae4ab1872d2ee986df791f3ffd9e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 21:12:53 +00:00
Bill Yi
db8e6f51ff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icff837fb7d2cb9bdde78747c6449b7602d657ddf
 2023-06-12 13:37:36 -07:00
Bill Yi
58628e0170 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2daf643f4601e64d83742cfbf1d895e8b272bc98
 2023-06-12 13:36:39 -07:00
Bill Yi
b47c44e4dd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28c26bf0d71aab0563698fb120e7a2f3ff808f53
 2023-06-12 13:31:49 -07:00
Bill Yi
23819646e2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7203e546696a4dde1d8c8f7b32e6a432f7a5bcb8
 2023-06-12 13:29:45 -07:00
Treehugger Robot
c823f0aa45 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Icba0b458b25bdef0dc25a4882c9c8799d0a46885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:29:38 +00:00
Taran Singh
6f6747910d DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I44012b898eec57e26fdc4d6d4a38c54578b8a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:29:37 +00:00
Treehugger Robot
1d279af211 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Ie301b476186f5861c01ca69cfedef5e6e9455a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:29:18 +00:00
Treehugger Robot
48b541abfb Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I572e58d1ce3150a8d5a9e489fe5b55f00177e57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:29:18 +00:00
Taran Singh
feea08e693 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I533b1a673de2d3660a75452f5f7c58fe33ab55a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:29:17 +00:00
Taran Singh
4a5e1a4d3f DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Idaf9439f1efd96653858177bdea474ad4b85190f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:29:16 +00:00
Treehugger Robot
a0c080fd28 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Iaaa5b9fbdc625d749aa87e2dee865e68bc16b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:29:13 +00:00
Taran Singh
c4e19d2afe DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Ib9a8ac9c10c27d50b99b1501e28a6766ff3ce70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:29:11 +00:00
Bill Yi
5e54379b8a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib262798ed73568339f2f5ac4e6cf40c1ab08f7c6
 2023-06-12 13:28:15 -07:00
Bill Yi
948e9dd4e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I426130e9ad9afe161ca3a02576d2814c2d35364c
 2023-06-12 13:27:10 -07:00
Bill Yi
b86bd3cfe3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I03150507e9d454e50da97bbf70752f7fc2736975
 2023-06-12 13:26:17 -07:00
Bill Yi
49d00437a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id5d119a140094265999e5ac40d4444956d1cbf4c
 2023-06-12 13:24:36 -07:00
Bill Yi
29e59fbd3a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f0371fcd4317dd3da3dbcb11f0b0d472ca24673
 2023-06-12 13:22:55 -07:00
Han Xu
be311b88c9 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: e319c686e7 am: 11b3eefc33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I0cae44c45c55c7a845d6bb6370fa675551861f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:09:33 +00:00
Han Xu
9cba14f0a5 Add manufactured year into hardware info page am: b452bc9f9d am: 2fb6c5887d am: 13b6d23ef2 am: 9f52cc6270 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I524780e02c86132af54527f9c595ef46015ed299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:06:59 +00:00
Han Xu
9e36ae77ba Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: 24fc0d6744 am: fc05f6766e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ie23e42c553e8016f866b00bd08d97555fae02188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:06:36 +00:00
Wenhui Yang
7e6443e025 Fix face re-enroll stuck for work profile 
Call super.onCreate(savedInstanceState) first to pass the correct userId
in maxFacesEnrolled.

Test: Manual - delete face unlock for work and re-enroll and observe
face unlock can be enrolled successfully
Test: atest FaceEnrollIntroductionTest

Fixes: 284819031
Change-Id: Ic1620c0ca3ca9adc61f5281abd34471f0c1b3f97
 2023-06-12 20:06:01 +00:00
Treehugger Robot
decc428857 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev 2023-06-12 19:57:26 +00:00
Han Xu
11b3eefc33 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: e319c686e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I86b4bc61572462e94e51762ca89722b55c44658f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:56:32 +00:00
Han Xu
9f52cc6270 Add manufactured year into hardware info page am: b452bc9f9d am: 2fb6c5887d am: 13b6d23ef2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I8f6c848180d7e386f80e4326bc46642474490d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:53:51 +00:00
Han Xu
fc05f6766e Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: 24fc0d6744 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Idb39c3d58e9e90f03ec329ab72b772ab705ef7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:53:23 +00:00
Han Xu
45fcb540b2 Add manufactured year into hardware info page am: b452bc9f9d am: faa02ca7e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I6511718c862061a75ce47ad0c63240d403e1a8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:08:36 +00:00
Han Xu
e319c686e7 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I29b80b692bc97132b5cc7eac3d3a153d0f93d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:08:24 +00:00
Han Xu
13b6d23ef2 Add manufactured year into hardware info page am: b452bc9f9d am: 2fb6c5887d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ib46aa4c7d5f34e2967e14b4705392c343aa7df7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:08:05 +00:00
Han Xu
24fc0d6744 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ia99e7b22230a44bbe5c70bcac17b64cd5536e4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:06:18 +00:00
Han Xu
1a9a892ff3 Add manufactured year into hardware info page am: b452bc9f9d am: eefb4e777d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Id5c47cbcbefad23dc81eb4e597aed8a21a36affc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:06:10 +00:00
Han Xu
2fb6c5887d Add manufactured year into hardware info page am: b452bc9f9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I59bab60a59b531e25663b3e34a554f3ac7dfc87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:44:38 +00:00
Han Xu
faa02ca7e7 Add manufactured year into hardware info page am: b452bc9f9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I9ece7cc81a254db4d57f6ee61a2c19b96414a67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:43:51 +00:00
Han Xu
eefb4e777d Add manufactured year into hardware info page am: b452bc9f9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I75182c66daf65a4b48cfe7a66fb67cbbfba74b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:43:48 +00:00
Han Xu
15da26329f Add manufactured year into hardware info page am: b452bc9f9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I53f6c06271bb862cd16e2f3cb48886f764686d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:43:44 +00:00
Treehugger Robot
f572bed648 Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1 am: 6fb7cb85fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999

Change-Id: I31ff110702752ffcd819e94106a1434963ef6e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 10:37:10 +00:00
Treehugger Robot
6fb7cb85fd Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999

Change-Id: I33ea753d6fcf8ced79a315652134513b40b0cfb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 09:55:15 +00:00
Han Xu
b452bc9f9d Add manufactured year into hardware info page 
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
 2023-06-12 17:43:55 +08:00
Treehugger Robot
55774422b1 Merge "Remove redundant methods and refactor" into udc-qpr-dev 2023-06-12 09:05:05 +00:00
Yi-Ling Chuang
f148baa372 Remove redundant methods and refactor 
Remove the summary method and write the code in AOSP directly instead to
force string consistency. Also refactor a bit after the modification.

Fixes: 276399056
Test: robotests
Change-Id: I76ad740b694363a3cdfb3748e41c840fb678b93d
 2023-06-12 16:11:49 +08:00
Rhed Jao
f01b99e725 Passing the writing repair mode password flag to verify credential api 
Handles the ACTION_PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL intent to
prompt the user for device credentials. Passing the writing repair
mode password flag to the verify credential api when the user is
authenticating.

Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
Change-Id: Id018586b0ed535555c157b7516c9571b049978ad
 2023-06-12 06:34:24 +00:00
Jason Hsu
da355b435f Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: bab462f1d6 am: bc62033a87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I96662d8cd8d267840c8b7ff70486d8c364fd7e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 06:20:51 +00:00
Jason Hsu
f156bda553 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: d2c7424293 am: 99f2fa9e4c am: 9ca9d53971 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I7e0ce94dff5d210da5aca52432b96f7119f385c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 06:19:35 +00:00
Jason Hsu
b034d60b52 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: 50ac77ebfe am: 82bc64d4ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I270922726f5293e54fc9bca373f3fd69c82c485d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 06:17:11 +00:00
Jason Hsu
bc62033a87 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: bab462f1d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Icde34b635bd7c9995048d79346aa8bafa0a05831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 05:35:17 +00:00
Jason Hsu
9ca9d53971 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: d2c7424293 am: 99f2fa9e4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I1affa2468097e9d888c7fb2dbaf1602a82170f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 05:30:56 +00:00
Jason Hsu
82bc64d4ee Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: 50ac77ebfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Icc2928b5a74fdad3390dc89d43fe8c4604344d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 05:29:34 +00:00
Jason Hsu
99f2fa9e4c Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: d2c7424293 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ic6e8eab1f1ced09ee132646f2df5f48aeb0b7086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 04:53:08 +00:00