PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,807 Commits 1 Branch 0 Tags
ba88ece9fb2afbf94aca79bcbf6db6fcf5192d3c
Commit Graph

123807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wenhui Yang
4eceb6c5c5 Merge "Fix face model delete message" into udc-qpr-dev 2023-06-06 21:09:56 +00:00
Ale Nijamkin
163c01ab4c Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Ie370f2e7fe8e473d46fec5a88ee831042d47903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:27:23 +00:00
Ale Nijamkin
1e3ecf6352 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:44:29 +00:00
Wenhui Yang
5e71aee4cd 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
 2023-06-06 19:44:17 +00:00
Ale Nijamkin
b5dda005fd Merge "Fixes nav stack issue." into udc-dev 2023-06-06 18:48:59 +00:00
Matías Hernández
ff255c6eda Don't hide approved NLSes in Settings 
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.

Bug: 282932362
Test: manual
Change-Id: I4c9faea68e6d16b1a4ec7f472b5433cac1704c06
 2023-06-06 19:07:58 +02:00
Treehugger Robot
1a02d5733e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fafd92ec660c4538dbf271853586f583bed6d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:38:50 +00:00
Bill Yi
90d348eabc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc73ddf4d3a46111f76e580d39716cf5cfa194f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:38:42 +00:00
Treehugger Robot
650273ab86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4daf75a74251228c07412348cabc533b2e4b8b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:38:37 +00:00
Bill Yi
9c4773b9ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0cbc0e34e0b364db859ea276370aadffa440e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:38:17 +00:00
Treehugger Robot
7858247c64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4622ca39108918a59f21f22797d6674176686411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:38:03 +00:00
Bill Yi
23022e0835 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b6c3746f36c1b969acc795ab4347b6665b791fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:37:52 +00:00
Treehugger Robot
44ccdc1fee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 1dc6b2d265 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If928bd144616d329e8f1ea22500705541dbb15b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:34:41 +00:00
Bill Yi
e881cb0f82 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: c0e9862110 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b81faa7fc904e9c0ae12ca9603448baa892ca55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:34:37 +00:00
Treehugger Robot
7e87dbe180 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 12ec34641e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43a85864fbad3af98f65c01a7f236548ed173093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:33:20 +00:00
Bill Yi
702dadee71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours am: fe99021d55 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I8ded5450405b9612f8e38db5d9eba6500a2edac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:33:07 +00:00
Bill Yi
ff6629bf08 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours am: 5e71a3fdf4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifec471e13bf49ce8f294ff218ce9cf4a857cfd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:32:50 +00:00
Treehugger Robot
d38c1958fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours am: f14e96fe88 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e63a80f3e00e7642f729fccf693b8d3097ac9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:32:37 +00:00
Bill Yi
6b2bcbd3ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours am: 4fdf445fc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1198a941fb054b4eefa1adc89735a1141f7e5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 15:32:28 +00:00
TreeHugger Robot
0fc88fe5ec Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-06 15:05:24 +00:00
TreeHugger Robot
ce5a816f29 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-06 15:05:24 +00:00
TreeHugger Robot
6c069119ea Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-06 15:05:24 +00:00
Treehugger Robot
fb4945a4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
8db6cc323c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
c1fdb0bec2 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
1dc6b2d265 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72e52377e732dfa56e16340b98aa6660ca06858f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:51:01 +00:00
Bill Yi
c0e9862110 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: Ie1f7e796600b5ed714c99ae7fa74cf8455962030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:49:23 +00:00
Bill Yi
5e71a3fdf4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I55893373046dc2d041b6b9fe8b5bba6ff4fd8b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:48:55 +00:00
Bill Yi
4fdf445fc4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f63c4860010286a27d32882b3f3bcdfb743c2ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:48:41 +00:00
Treehugger Robot
059773bd86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03d8e31c1ab27742b95e0a528a135aa15db4e4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:46:16 +00:00
Bill Yi
284d320abb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e9438ad10906e729a3eafbb69410fa4ce011c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:46:11 +00:00
Treehugger Robot
ba4dc8f0bc Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
d8d85a8485 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
8c296cdd64 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
f996cfceba Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-06-06 14:19:16 +00:00
George
d41299016e Correct typo in the launch via NFC bottom string 
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
 2023-06-06 21:39:01 +08:00
Aleksandar Kiridzic
a882fd268d speech: On-device recognition settings profile selector 
`Settings > System > Languages > On-device speech recognition`
entry is currently proceeding to the settings page for the personal
profile by default. If a work profile exists,
a profile selector should be shown first.

Bug: 269575714
Test: Manual, already existing robotests
Change-Id: Id95a9716358ec3a813c77275bd65f0cbdfc9aefc
 2023-06-06 14:10:34 +01:00
SongFerngWang
13cd052693 ForgetDeviceDialogFragment check whether device is null or not 
Bug: 280687867
Test: build pass
Change-Id: I4134569854165f20f6287406d9ed627b2c15c05b
 2023-06-06 09:53:36 +00:00
Treehugger Robot
2237bd2d6e Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: Iac12a1a635d0aab70b994f49a18b4914aa0d412e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 07:20:29 +00:00
Treehugger Robot
d05997872a Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: Ice47c201387d778d3bee0aa239fdd3b3eb59a031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 06:38:00 +00:00
Treehugger Robot
185244f43d Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev 2023-06-06 05:49:40 +00:00
Alejandro Nijamkin
6f9f3a4594 Fixes nav stack issue. 
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.

Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.

Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
 2023-06-05 16:02:17 -07:00
TreeHugger Robot
2856b252d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours am: 0741621536 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe3cea4b4ece61347fb93d890c672545f36ccfa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:24:25 +00:00
Bill Yi
1286e7ab43 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours am: 556351d016 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1477b37dc8cbd0d5bc86f486ba6baaa8bcf54a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:24:21 +00:00
Bill Yi
586019ca54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours am: 6f0fe3ef25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib88fdf870873420321cca7829c8e6462c6ad7adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:59:34 +00:00