PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,078 Commits 1 Branch 0 Tags
37329a1775afbe479ab58b10da05cce5a1907706
Commit Graph

126078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zaiyue Xue
37329a1775 [automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc -s ours am: d593cb5284 -s ours am: 7bfd068d24 -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I2a8ab7f6daf55385d8dccdcdce9f193dde2158d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:51:23 +00:00
Treehugger Robot
2179e44ebe Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc am: f47dbe3bae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I37b5082e932c4141dcb3b277c84b096d93ffb3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:51:15 +00:00
Treehugger Robot
2db2e2c8ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: 7e88b1ed07 -s ours am: 10abf2f63a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida81c1d241df32714205d9d046db51a308c055f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:49:56 +00:00
Bill Yi
809905795e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: d0d5c9d84c -s ours am: ef7c503634 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8daac4f5ac5f61a135966a4bbd0a2e721cf61bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:49:49 +00:00
Treehugger Robot
82a566dff7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 7930f72c4d -s ours am: a411c734bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9eb882025e8da62dc8119a7c5aaf5ee78634905d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:49:46 +00:00
Bill Yi
33c08bafc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 7c2f3a4ba1 -s ours am: ad194b0927 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id08525905c17308687d8479aeffdda65edbe6bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:49:27 +00:00
Treehugger Robot
017e0daa72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 7d610e7f85 -s ours am: 1dfa0e78df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic973ade7400dedbcfe22625140dab9236c002d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:49:06 +00:00
Bill Yi
bd3ae5e037 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: 94f17b981a -s ours am: 211d2eb69a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5a7b3de9f889322e394cb15c0b4c5e3d20c19a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:48:49 +00:00
Zaiyue Xue
93968293ef [automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 am: da62051efd -s ours am: 7cf38b4f81 -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I8b57700ba20bff2a289d7c4a21f81801368a782d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:48:09 +00:00
Zaiyue Xue
7bfd068d24 [automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc -s ours am: d593cb5284 -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I1887b1781d9f6232ee1403787175340a26142a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:24:20 +00:00
Treehugger Robot
f47dbe3bae Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I2b65e858794346e3231bb7fdb0a013a2d4934677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:24:10 +00:00
Treehugger Robot
10abf2f63a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: 7e88b1ed07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I582b7c8daa30334e77e4f3d29bd1c6b33223bf40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:06:57 +00:00
Bill Yi
ef7c503634 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: d0d5c9d84c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f452ce55a6fad205b0b45335a59b60d64c09a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:06:53 +00:00
Treehugger Robot
a411c734bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 7930f72c4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbe8cf0ba06661a66dd9dce9cc29068ab7e560f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:06:46 +00:00
Bill Yi
ad194b0927 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 7c2f3a4ba1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfab197e4900a1d3ee7538fdb17c20c91be8bdf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:06:27 +00:00
Treehugger Robot
1dfa0e78df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 7d610e7f85 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I483c7df647a3a7fc3b129c482a8b5ab36727f29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:06:01 +00:00
Bill Yi
211d2eb69a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: 94f17b981a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idae32d533f1de63ec852177471dbf4d35caacdcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:05:39 +00:00
Zaiyue Xue
7cf38b4f81 [automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 am: da62051efd -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I4107e4de3286498e46ff35e7cc1b4ff91b341545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:04:55 +00:00
Treehugger Robot
7e88b1ed07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd531ab1576b548a996d8f975d130eefb8a30360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:42:34 +00:00
Bill Yi
d0d5c9d84c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I87b24056f4a0d370634fe2ccc2237ea8045fddea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:42:25 +00:00
Treehugger Robot
7930f72c4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I850098c780abe7d600eee7243df0f033d387f1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:42:18 +00:00
Bill Yi
7c2f3a4ba1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibcd3f5106e8f6ca98315c92437b7a0179f1e66ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:41:55 +00:00
Zaiyue Xue
d593cb5284 [automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I51cf1905b8ae5b97b24facedf343375c983f7b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:41:39 +00:00
Treehugger Robot
7d610e7f85 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12b528b5410a96bf63d6fb645f12682e57e40b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:41:36 +00:00
Bill Yi
94f17b981a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29ed00f4ef95520f1ebbe6ecdadf9eaa6d1432c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:41:19 +00:00
Zaiyue Xue
da62051efd Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963

Change-Id: Ie9e6621a39e30b5ba000e2bf6516719eea2a8fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:39:42 +00:00
Treehugger Robot
57522f0fcc Merge "Shutdown secondary SAP automatically" into udc-d1-dev 2023-06-14 03:35:18 +00:00
Treehugger Robot
a505517090 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-14 03:32:14 +00:00
Treehugger Robot
c706f8544d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-14 03:32:14 +00:00
Treehugger Robot
958690e3a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-14 03:32:14 +00:00
Zaiyue Xue
8c25fe4c60 Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev 2023-06-14 03:01:25 +00:00
Weng Su
20fd4a46c8 Shutdown secondary SAP automatically 
- If the "Extend compatibility" preference is not supported, then set to shutdown secondary SAP automatically within the "Turn off hotspot automatically" preference.

Bug: 285914977
Test: manual test
atest -c WifiTetherAutoOffPreferenceControllerTest

Change-Id: I405107a4782a6f023442d196d0fca27515aab00e
 2023-06-14 05:51:43 +08:00
Wenhui Yang
13ce0bbd12 Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba am: e839945290 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227

Change-Id: Ibcf91b318092a660b114b5c855c37995f6006ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 21:34:02 +00:00
Wenhui Yang
e839945290 Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227

Change-Id: I147cb8b08941e5b56836c2d95456b605a2ed55f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 21:11:21 +00:00
Wenhui Yang
d56f96aaba Merge "Fix face model delete message" into udc-d1-dev 2023-06-13 20:43:42 +00:00
Grace Cheng
2d5f43d7e3 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c am: f0614ef722 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: Icb68998721d53d5adbbbfe361b22361037e101e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:31:17 +00:00
Bill Yi
9352e1c2dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: 32b73cd4ea -s ours am: fec819220b -s ours am: 25683d53c4 -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: Ib551887d4824182562d52b9be25e07310d2803b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:29:18 +00:00
Bill Yi
f1566e9a2d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: d152123a74 -s ours am: c0c0c7cf5c -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: I2b3eb103b3247c6fb965f2f5c18c7c61f6c51a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:17:45 +00:00
Bill Yi
0ddf5f1eaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: a8cf863944 -s ours am: 88d7f8f441 -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: I77a4ac57a14849c5e2c0da355b11fb90d4cc831a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:16:12 +00:00
Bill Yi
bd7089ca70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: a20c952bb6 -s ours am: 7c411855f0 -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: I525760d413e9a941cb578da0586084c62b19d8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:15:55 +00:00
Bill Yi
2d9af65f5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: 60f3e2d53d -s ours am: 0aafcc81f4 -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: I449caac98a9aeb2423139d8b35567760aeff0b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:15:39 +00:00
Grace Cheng
f0614ef722 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: I6332c141e3bb13b49bbabfcfebc3e91b8a5faf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:01:00 +00:00
Grace Cheng
8ba960014c Merge "Fix NPE in updateAddPreference" into udc-d1-dev 2023-06-13 19:22:55 +00:00
Bill Yi
25683d53c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: 32b73cd4ea -s ours am: fec819220b -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: I42f065234404c9ef6a5379172eb3be8ac5f51d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 19:00:10 +00:00
Bill Yi
c0c0c7cf5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: d152123a74 -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: Ieb870030aaf1cd3354c2b20aa99f9c356e6878d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:58:13 +00:00
Bill Yi
88d7f8f441 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: a8cf863944 -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: Id208c14207c5e1d71e62fdbbdf26930c090ba899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:55:37 +00:00
Bill Yi
7c411855f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: a20c952bb6 -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: I2f6fef157726b19b540457edbfd08c5b0e4f3588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:49:54 +00:00
Bill Yi
0aafcc81f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: 60f3e2d53d -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: I4a3471957af3c76235929e9eb6da89ccb9fb7155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:49:10 +00:00
Bill Yi
fec819220b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: 32b73cd4ea -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: If4718b30ee626a955a2da4d2d577116cde5bd6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:48:15 +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