PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,424 Commits 1 Branch 0 Tags
516ef08351894e66e6a55033dc4fd9a40effc8e2
Commit Graph

111424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lbill
516ef08351 2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow am: e05697fc65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727251

Change-Id: Ib401d8eeb89c916a9cf934f6dcce6bc101d6965a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:02:18 +00:00
Milton Wu
fe819292e3 Fix face enroll introduction crash after 10mins am: 8e57808247 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454691

Change-Id: I98f9468ff878f9aefb67e29b694a52eb1b910f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:02:12 +00:00
Diya Bera
81ab030e4c Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev am: dc071e94cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919289

Change-Id: I18729fd0f253008a29d9da947e833cab42238efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 00:17:04 +00:00
Joshua Mccloskey
dc0f04d7ee Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev am: 7b8bddaac0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20931688

Change-Id: I22bee3710fa6cdf31c15aae69691f94ddf38aa80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 00:12:33 +00:00
Diya Bera
dc071e94cd Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev 2023-01-11 23:52:35 +00:00
Joshua Mccloskey
7b8bddaac0 Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev 2023-01-11 23:43:54 +00:00
Joshua McCloskey
4915a5932d Added performant auth feature am: b8695b8e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20937285

Change-Id: I1214d53edf57e1b45efd3d81c7e0305d83e94459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 21:38:32 +00:00
Kevin Liu
c41c1fb83c Revert "[automerger skipped] resolve merge conflicts of 521278a0..." 
Revert submission 20943849-am-ba81bb49f0b54fb08295adf7418e1fd4

Reason for revert: Automerger did skipped some of the important CLs will resubmit to tm-qpr-dev

Reverted changes: /q/submissionid:20943849-am-ba81bb49f0b54fb08295adf7418e1fd4

Change-Id: Ib639a1d8c81a1b3fcd8504704f55854fc36f4cb5
 2023-01-11 18:24:54 +00:00
Joshua McCloskey
b8695b8e76 Added performant auth feature 
Test: Manually verified in settings that the performant auth
feature(fingerprint) is disabled by default
Bug: 261216422
Bug: 265031172

Change-Id: I6422b12f801d038fa514758eca34efcbfdeef27a
 2023-01-11 16:43:54 +00:00
Kevin Liu
8f5103a748 [automerger skipped] resolve merge conflicts of 521278a00d to tm-d1-dev am: 15ef36bc54 -s ours am: 988e1712a3 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed0a is already in history

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

Change-Id: Ib4d64f88405e9e6a7925787ba2d4bd3c28ac69ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:31:12 +00:00
TreeHugger Robot
02cace2f67 Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103

Change-Id: I1c586d8d135b6238662b228b2101ab4de4d369ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:30:41 +00:00
Kevin Liu
988e1712a3 [automerger skipped] resolve merge conflicts of 521278a00d to tm-d1-dev am: 15ef36bc54 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed0a is already in history

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

Change-Id: I341ba1b28ad4b7b14da45f2e8c62c20d19d6fe91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:14:54 +00:00
TreeHugger Robot
61f81ffb07 Merge "Update wallet setting availability" into tm-qpr-dev 2023-01-11 14:54:39 +00:00
Behnam Heydarshahi
4fc098dc1b Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598

Change-Id: I1dbbde115a9e92ecc1b602607827d51ec2078102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 14:34:49 +00:00
Behnam Heydarshahi
ee56e95f90 Merge "Implement a separate controller for ring volume" into tm-qpr-dev 2023-01-11 14:08:01 +00:00
Treehugger Robot
8601b70e1c Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ibb2373d9410439be710b78c9e61c697f87bb28b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:53:43 +00:00
TreeHugger Robot
e9da17a8b9 Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev am: fb0986623f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904549

Change-Id: I1ce36528fa8ae6d30ad6aecc880c3bbf905fabba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:36:19 +00:00
TreeHugger Robot
b464bfa049 Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev am: ecb7c54fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904550

Change-Id: I4e713518a4f0de69a4d85514315048d438b53fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:35:17 +00:00
Treehugger Robot
9c8ff84746 Merge "Amend "Reset notification importance" list item style" am: aef592eb18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ife8b88093010ff9fea43758057d334bbea50540a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:19:53 +00:00
TreeHugger Robot
fb0986623f Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev 2023-01-11 11:05:12 +00:00
TreeHugger Robot
ecb7c54fc5 Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev 2023-01-11 11:05:07 +00:00
Treehugger Robot
aef592eb18 Merge "Amend "Reset notification importance" list item style" 2023-01-11 10:31:55 +00:00
Shen Lin
1721d0f276 Amend "Reset notification importance" list item style 
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.

Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
 2023-01-11 05:21:59 +00:00
Joshua McCloskey
3e0f8365f5 Fixed scroll issue w/ FP settings 
Test: Verified fingerprint preferences are not shown over the fingerprint title when device is rotated in settings screen
Fixes: 259338792
Change-Id: Ie99e584247bb52b097e949d0c8c0ed096543aa21
 2023-01-11 02:04:41 +00:00
TreeHugger Robot
26f47177a3 Merge "Update string" into tm-qpr-dev am: 8dc66bc482 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20925429

Change-Id: I484277c3466ccc0a48f276e3bd0b933ab6be34d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-10 20:00:50 +00:00
TreeHugger Robot
8dc66bc482 Merge "Update string" into tm-qpr-dev 2023-01-10 19:28:16 +00:00
Lucas Silva
600741c78c Only show communal settings to the primary user am: e33639f117 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20859979

Change-Id: Ia66b6011f37412bbbdf783b3d5f844446f4fc1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-10 17:22:02 +00:00
Julia Reynolds
fc63046f32 Update string 
Test: view string in UI
Fixes: 262094151
Change-Id: I4f55c340d3144d446465d64008d9d92d622425ae
 2023-01-10 16:23:57 +00:00
Kevin Liu
15ef36bc54 resolve merge conflicts of 521278a00d to tm-d1-dev 
Test: I solemnly swear I tested this conflict resolution.
Bug: b/264918004
Change-Id: I6125be25233ffb33e10cc98444017b3d3a99f1f9
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2023-01-10 15:42:02 +00:00
Diya Bera
00dfcd83dc Fixes background color in SUW fingerprint enrollment 
Test: Manual (Enroll fingerprint in SUW, background color remains the
same)
Bug: 246231650
Bug: 250464527

Change-Id: Iffd1543d8b230199c3b925c6538bd418a381c96a
 2023-01-09 23:52:34 +00:00
Kevin Liu
521278a00d Merge "Use Mockito 4.6.1 API" into tm-dev 2023-01-09 20:54:06 +00:00
Lucas Silva
e33639f117 Only show communal settings to the primary user 
Fixes: 264284347
Test: flashed device, and verified settings don't appear for secondary
user. Setting still appears for primary user
Test: atest CommunalPreferenceControllerTest

Change-Id: I6686ce4dbc7d708a93131620ae93c5e0dc323995
 2023-01-09 15:15:27 +00:00
Bill Yi
754110751c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f8b28eaf4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b35a6c8266325bd03509096103cdc9228a9735f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-09 15:09:58 +00:00
TYM Tsai
be9cb36c6e Fix html injection in Autofill confirmation dialog 
AutofillService can inject html in its label. The label will
be padded with line breaks which puts the warning off screen.
To fix the issue, disable html injection of the label.

Bug: 216117246
Test: Manual, check the label of the sample in
      the confirmation dialog
Change-Id: I244d8e9eadbacae6af615d1d2a5a99c86e4fa456
 2023-01-09 08:35:56 +00:00
TYM Tsai
a1ca72224d Fix Content Capture service starting after restriction 
When a device owner and a profile owner restrict Content Capture,
there should be no toggle setting to turn on Content Capture.

Bug: 250573776
Test: Manual. Use setps on the comment#3,
      make sure no toggle setting in the Privacy page.
Change-Id: Ia17f852b224c67b9c1cf5846ee9ad5592a485bab
 2023-01-09 08:34:40 +00:00
lbill
e05697fc65 2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow 
1. Add config_suw_support_face_enroll default is TRUE
2. Impl FaceFeatureProvider to obtain the config
3. Overlay config_suw_support_face_enroll by requirements

Test: Flash build and manual check if device go through face enroll in SUW
Bug: 262469686
Change-Id: I61aa5c818bedfb490f2172a7481f59fda7295c1a
Merged-In: I61aa5c818bedfb490f2172a7481f59fda7295c1a
 2023-01-09 08:27:48 +00:00
Milton Wu
8e57808247 Fix face enroll introduction crash after 10mins 
When requestGatekeeperHat() throws exception in FaceEnrollIntroduction
page, remove gk_pw_handle and recreate activity to trigger confirmLock.

Test: robotest for FaceEnrollIntroductionTest
Bug: 234437174
Change-Id: Ie1dd6f36e4deb3f776e3b39acd165fc47d04f526
Merged-In: Ie1dd6f36e4deb3f776e3b39acd165fc47d04f526
 2023-01-09 07:38:59 +00:00
Bill Yi
9f8b28eaf4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I76b6b2f37d0dee1347d3c5b16b9d6ba3088b31aa
 2023-01-08 02:43:59 -08:00
Betty Chang
f0b70510d8 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 am: ddeff2f67f -s ours am: 30783964b3 -s ours 
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I292f88e40c9e6228dd6395fa6f6be4cf896ce4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 09:09:10 +00:00
changbetty
3afa2f08f2 [automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 am: 7888fcc82b -s ours am: e7f0596113 -s ours 
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: Id7b72ef1e840e8c401d5167691d892fc54fa56de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 09:09:06 +00:00
Betty Chang
30783964b3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 am: ddeff2f67f -s ours 
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I0fbd5e7104445bc1f4176c56522b335870b1c7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 08:39:48 +00:00
changbetty
e7f0596113 [automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 am: 7888fcc82b -s ours 
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I6c0fb65c5ce73586624b75929a6992bc3a58a4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 08:39:46 +00:00
Betty Chang
ddeff2f67f Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713

Change-Id: I66295604e4413f7c6d9a1067abeab07b14eeae63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 08:01:20 +00:00
changbetty
7888fcc82b [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713

Change-Id: I3b67d30e794dd06a689c57c9fd6b948bbea362f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 08:01:18 +00:00
Yanting Yang
ab4cd3acdf [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours am: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -s ours am: 618af44b70 -s ours am: d0c69f7ae7 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334 is already in history

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

Change-Id: I49a24450f1b28aa4e0767757a9e8eaabb5f3aab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 07:57:50 +00:00
Betty Chang
9cb6a08d16 Merge "Change the intent flag to immutable" into tm-qpr-dev am: cfc1569f12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20802849

Change-Id: Iaf38ffd1366880869dfb9bbda3e9e57aea337b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 07:57:39 +00:00
Yanting Yang
d0c69f7ae7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours am: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -s ours am: 618af44b70 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334 is already in history

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

Change-Id: I87141bf0fba2bd6b66fe0fa59377138271e0576f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 07:24:10 +00:00
Betty Chang
145d91b832 Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev 2023-01-07 07:23:30 +00:00
Betty Chang
cfc1569f12 Merge "Change the intent flag to immutable" into tm-qpr-dev 2023-01-07 07:23:02 +00:00
Yanting Yang
618af44b70 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours am: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334 is already in history

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

Change-Id: Ida9886743b149f43cab923e5f56778065e7e04b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 06:49:11 +00:00