PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,471 Commits 1 Branch 0 Tags
7461036d68a8cceadaee78c3c5a7661479ad971c
Commit Graph

126471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b8ddf4126c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-06-14 03:33:21 +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
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
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
Bill Yi
d152123a74 [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: I9b83f96b046054735004994bba24dba2b53c610f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:15:54 +00:00
Bill Yi
a20c952bb6 [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: I2b1476f7e11814649388cc8c08c976b1bb1a643d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:15:33 +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
32b73cd4ea [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: I5cc0f93640e97a83a96c3e37d1a891dd0dd82d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:04:11 +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
375736a156 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-qpr-dev am: e5ebbd4ef1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545061

Change-Id: I84a25bcf3b49af25aebf8e939dbc5e3e39e701b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 13:54:28 +00:00
Taran Singh
24d2af03ad DO NOT MERGE: Prevent non-system IME from becoming device admin am: 45e2c72877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545061

Change-Id: Ie949ff50de3320bc254df90a672bbdc0ae976663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 13:54:24 +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
3ada1f3da8 Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev am: 38b627b69c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23475256

Change-Id: I1be256ff509008bbd0270a7758c14dd1d8413723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 09:42:07 +00:00
tom hsu
4489840fec [Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec am: 5c5a39adbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882

Change-Id: I297134f81a1a148d06decd50b155a9333c5946fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 09:41:46 +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
d09cfbeb05 [Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec am: e21d27c5ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882

Change-Id: I9ad25617fc2d6142c8455be78ac8118799ab505f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 09:36:12 +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
tom hsu
e21d27c5ef [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: I61dc41ada82f1fbcba4c1b337681ebd3e4b47055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 08:54:36 +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