PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,852 Commits 1 Branch 0 Tags
7fe4f7aa4c10ffb6c86e5503aa5459f3f9ddb04d
Commit Graph

133852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7fe4f7aa4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2db4ba3b4 -s ours am: 1a8d90b337 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5eb07b9d873a74f10464f9ba40f0bd8ec3fbc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 01:56:54 +00:00
Bill Yi
a9ac8645fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 0da3cedcc0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic06029241cde83e605423998553179948ba838bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 00:25:52 +00:00
Bill Yi
5a16ea8c50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e04caacadf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf051e3e6395b6339ff349297abcbba1c54c6941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 00:25:39 +00:00
Bill Yi
c76d273cef Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-16 23:43:22 +00:00
Bill Yi
8bb5edf23c Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-16 23:43:22 +00:00
Bill Yi
d3176987b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-16 23:43:22 +00:00
Bill Yi
0da3cedcc0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-08-16 23:42:56 +00:00
Treehugger Robot
5329b06ae7 Merge "Fixing RemoteAuth Tests breakage" into main 2023-08-16 19:43:10 +00:00
Justin McClain
d971817112 Fixing RemoteAuth Tests breakage 
Fixing RemoteAuthEnrollFinishTest, RemoteAuthEnrollEnrollingTest, and
RemoteAuthSettingsTest by changing `isDisplayed()` check to the intended
`withEffectiveVisibility()`.

Bug: b/296191086
Test: make RunSettingsRoboTests -j40
Change-Id: I3405fd2709c83a966b83106c804880d00fc4bbf4
 2023-08-16 18:45:09 +00:00
Treehugger Robot
4f78ce0418 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 317931b506 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47012aa59ad737e04fecf7c940e430c5e9358548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:31:11 +00:00
Bill Yi
f2f9fb014f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 3c43f53a65 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b516a63ccb59a028fc8044367c14c844b0dd508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:31:03 +00:00
Treehugger Robot
a842ed7c47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: 094103da6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae8313d431005a96887a68c310865c6a8c804bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:30:59 +00:00
Bill Yi
cd9465109b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: 1f4e5b2024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I284895f2abfedb0e2d54556d2568d8a3dcb49d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:30:47 +00:00
Bill Yi
44bc24bb32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 721d30309e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If425a587f6dc0eecf5e5f63dc86f1f0be26fc057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:30:34 +00:00
Bill Yi
1a8d90b337 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2db4ba3b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib286ba6cf5549565b8c080debab8e03084f72f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:14:26 +00:00
Treehugger Robot
317931b506 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieace9704187dae85ede838fb8f2976b57ceeb465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:29:49 +00:00
Bill Yi
3c43f53a65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6b538c0aebb36aed4840dad43695b9b3fe669f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:29:41 +00:00
Treehugger Robot
094103da6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa7f5bf0ac48811d5202ed362e6718b053d9a431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:29:32 +00:00
Bill Yi
1f4e5b2024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8018d49e5fc8aa6f828c7a7ff399ab6fe5a910b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:29:17 +00:00
Bill Yi
721d30309e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec109478a187687646c43ae05f50ab72a7ad2f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:29:11 +00:00
Bill Yi
bc4a81b5bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b210245d52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e37890208a6e8a4024c484a54d353b0dc8c8bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 16:57:09 +00:00
Treehugger Robot
4585b13c9a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-08-16 16:33:50 +00:00
Treehugger Robot
7de409b834 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-08-16 16:33:50 +00:00
Joshua Mccloskey
9163a5db6d Merge "Basic structure for fingerprint enrollment." into main 2023-08-16 15:10:55 +00:00
Chaohui Wang
54d8bbcaf5 Merge "Use resource processor for SettingsRoboTestStub" into main 2023-08-16 11:09:09 +00:00
Tetiana Meronyk
3e6c31951c Merge "Disable multiuser toggle when more than 1 user is created" into main 2023-08-16 10:16:48 +00:00
Graciela Putri
ab7f57b17c Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev am: 83c8f47ddd am: 725efb1a5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309274

Change-Id: I5cdb28b8929b0ab8dba829ee6e12d880ca6cc27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 07:04:50 +00:00
Graciela Putri
725efb1a5a Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev am: 83c8f47ddd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309274

Change-Id: Ic2222519338f30df3d6dd5fea2df5b99bc4eb931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 06:20:48 +00:00
Graciela Putri
83c8f47ddd Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev 2023-08-16 05:31:44 +00:00
Chaohui Wang
f5335790bb Use resource processor for SettingsRoboTestStub 
Bug: 293810334
Test: m RunSettingsRoboTests
Change-Id: Ie063a19695e54619ef511b86e0bbed2c2db45a3e
 2023-08-16 13:28:02 +08:00
Bill Yi
1846501072 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9df571068061bffe477823871216b34915a56065
 2023-08-15 17:40:45 -07:00
Bill Yi
f2db4ba3b4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7f5da554a8b2bbffb823c9bf1bcba9f3acf71675
 2023-08-15 17:26:51 -07:00
Bill Yi
ca875c1273 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If776a5183b839dc0eaee9602839f238fec089bf7
 2023-08-15 17:24:27 -07:00
Bill Yi
fcc86e4d40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7c6ef64387f2e216af86bdda01b9a0de9826b79f
 2023-08-15 17:17:23 -07:00
Bill Yi
b210245d52 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I48a799093cbcd9bde0aec05fce89b1ede1f2234c
 2023-08-15 17:15:09 -07:00
Bill Yi
e04caacadf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ice181fffb6bcebdc1afbde4304bc76dba8d1d24f
 2023-08-15 17:13:07 -07:00
Justin McClain
5c739de558 Remote authenticator enrollment enrolling layout. 
This flow will be included in Device Unlock settings with the
Fingerprint and Face Unlock.

Bug: b/293908453
Test: atest RemoteAuthEnrollEnrollingTest
Change-Id: I56c7fb2481ace359813c27e7538bec0baceffced
 2023-08-15 20:11:31 +00:00
Justin McClain
3b56d1fca5 Merge "Remote authenticator settings layout." into main 2023-08-15 19:40:49 +00:00
Alex Salo
bab62119e8 Merge "Add oxford comma to passwords & accounts settings page" into main 2023-08-15 18:56:38 +00:00
Anvesh Renikindi
7b93594b7f [automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-qpr-dev-plus-aosp am: fde4c5d8c0 -s ours 
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 a7d7eb9a16 is already in history

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

Change-Id: If05c5aa2a8797be34742f4a9c978cab84f02d202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 18:51:10 +00:00
Andreas Miko
7df8aebceb [automerger skipped] Change nullability of inheriting function of PinPrivacyPreferenceController am: 4ca80e6013 -s ours 
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 a7d7eb9a16 is already in history

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

Change-Id: I912cb8c717c8236c4cd3d899680ce045b84acb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 18:51:03 +00:00
Bill Yi
863f3e3a35 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a1b6861b7c389c2c52f63226366510a36ac4987
 2023-08-15 11:06:44 -07:00
Anvesh Renikindi
fde4c5d8c0 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-qpr-dev-plus-aosp 2023-08-15 18:06:08 +00:00
Bill Yi
55c45ed419 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib12eb53f2344147d55bbd56093f1fa8a945bb1d6
 2023-08-15 11:02:18 -07:00
Bill Yi
f67ff302c5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7d1f3378e7ac754e78e12a4d7b71c67f0899fe1
 2023-08-15 10:59:35 -07:00
Alex Salo
f55c4bfb2a Add oxford comma to passwords & accounts settings page 
Bug: 295534240
Change-Id: Ic424c243e68aa58304f85ad68798c4c915bd05f7
 2023-08-15 17:33:31 +00:00
Joshua Mccloskey
12bf914caf Merge "Adding more tests for FingerprintSettingsV2" into main 2023-08-15 17:30:37 +00:00
Tetiana Meronyk
7968047fc5 Disable multiuser toggle when more than 1 user is created 
It makes more sense to have the toggle as on permanently as long as there are other users on the device. Otherwise if we toggle off "Allow multiple users", other users get hidden. Also with current behaviour the any admin can switch the toggle and this can block any other user, including main, from being able to use the device.

Bug: 295183792
Test: atest MultiUserSwitchBarControllerTest && UserSettingsTest
Change-Id: I8cb0671d780f45c17a9bb7c9a9d3b108128ead9d
 2023-08-15 15:59:14 +00:00
Kohsuke Yatoh
c06c74af17 Merge "Define "Add network" preference in XML." into main 2023-08-15 14:39:28 +00:00
Elliot Sisteron
4cb0ecc069 Merge "Respond with null data when no screen lock." into main 2023-08-15 11:55:11 +00:00