Wenhui Yang
d56f96aaba
Merge "Fix face model delete message" into udc-d1-dev
2023-06-13 20:43:42 +00:00
TreeHugger Robot
f2f899106d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
TreeHugger Robot
3b89844e7f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
TreeHugger Robot
6fd46cf3a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
Grace Cheng
f58714496a
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
Merged-In: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 19:23:04 +00:00
Grace Cheng
8ba960014c
Merge "Fix NPE in updateAddPreference" into udc-d1-dev
2023-06-13 19:22:55 +00:00
Wenhui Yang
08d11518a8
Fix face model delete message
...
Add new strings for face model deletion when fingerprint unlock is available.
Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
(cherry picked from commit 5e71aee4cd
)
2023-06-13 18:37:26 +00:00
Bill Yi
a8cf863944
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I1714b84269a401d01b495d3f49f66e02503cddd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:49 +00:00
Bill Yi
60f3e2d53d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Ic267c3e00a34a48e259821fff2849694b2133b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:28 +00:00
Bill Yi
c7d760438a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I31527b6935660fe76669f6d711beb978e55600b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:05 +00:00
Bill Yi
c52befa925
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Iab183d63901b1abd798cce19c452634518daca35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:03:19 +00:00
Grace Cheng
2365ad895a
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 16:52:51 +00:00
Treehugger Robot
e5ebbd4ef1
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-qpr-dev
2023-06-13 13:20:09 +00:00
Tetiana Meronyk
38b627b69c
Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev
2023-06-13 09:36:23 +00:00
tom hsu
5c5a39adbe
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: Id741c5c75d5982da0ceae3ceef767858e2bcf462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 08:58:46 +00:00
Bill Yi
b6f09ef6f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c435ac955d620aab019dd17088118e814dbec4e
2023-06-13 01:10:34 -07:00
Bill Yi
c1407e61f1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If3945f0ac9f4368b2cd50e66554accadc49e31ed
2023-06-13 01:00:54 -07:00
Bill Yi
8430cda6d3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I85702c2b4ddd2485683d5bb16bed43244e70022b
2023-06-13 00:56:19 -07:00
tom hsu
5216eeaaec
[Settings] Fix MMS message UI is no consistency between UI and real state.
...
Bug: 285253872
Bug: 281566495
Test: Manual test passed.
Change-Id: I805490fd5c4417e88c38a047f99ef626c16f600a
2023-06-13 06:01:25 +00:00
Rhed Jao
cc1fe61339
Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev
2023-06-13 02:14:22 +00:00
Wenhui Yang
bfa2feb316
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev
2023-06-13 01:02:42 +00:00
Wenhui Yang
14b115177c
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev
2023-06-13 01:02:08 +00:00
Treehugger Robot
fcea84c01a
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I5c7817afeac87f5f4854e5f4433121ba7ddfae92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:14:59 +00:00
Taran Singh
7e1d083e05
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: I6c689260a1ce82baee992262c0ea32512d758c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:14:57 +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
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
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
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
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
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
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
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
bab462f1d6
Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
am: 3608d5bf18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965
Change-Id: Id50ea2a480c6d674a77764e285642f2087df9c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 04:52:00 +00:00
Jason Hsu
3608d5bf18
Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965
Change-Id: Ia809e0cc8fa6e1503496e9ae7cbbeda5300d6b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 04:19:35 +00:00
Jason Hsu
fecfa96723
Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev
2023-06-12 03:54:11 +00:00
Zaiyue Xue
ec032710dc
Don't load battery entry names and icons in offline job to improve memory usage.
...
Risk: low (The name and icon will be always loaded again in the UI.)
Bug: 280720236
Fix: 280720236
Test: manual
Change-Id: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
Merged-In: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
2023-06-12 10:49:01 +08:00
Avinash Vadlamudi
9502bd9690
[Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e
am: 812ca56cfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571
Change-Id: I1001a1811c14a4d8002488a8051ae207a6f5477d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-10 02:44:25 +00:00
Avinash Vadlamudi
812ca56cfc
[Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571
Change-Id: Ib3b5ae9d55f47da3f9a7e5734bd8f6a55ae267f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-10 02:02:34 +00:00
Avinash Vadlamudi
01637b556e
[Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus
...
- set accessibilityLiveRegion as Polite mode to allow talkback to announce the state of checkbox even if is not in focus
Bug: 281950677
Test: Manual test by flashing on device and checking in talkback mode
Change-Id: Ia1066e2df1f40e6c339a4cd63f92acf0858f8f3d
2023-06-10 01:25:18 +00:00