PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,907 Commits 1 Branch 0 Tags
3e5a45c53a8819a4aa026b8bedbe791f8f782da8
Commit Graph

133907 Commits

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

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

Change-Id: I6e2c9549775a2f0a8639104b428a5489b50e603e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:15:13 +00:00
Treehugger Robot
dfa01168ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b9e13e44d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67d6c789a12d1b01a7ba3b2a9ca5839148af6996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:15:10 +00:00
Bill Yi
5a87ee3132 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55bf4eab3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib800197d9a8b8c9a42aa7e2ead7a273f63477cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:15:06 +00:00
Treehugger Robot
0f8ac3a82b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5ea61f6900 -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: I01e3fef35540addc4fd54551563c93e592da6b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:14:55 +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
960d04f4fe Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-16 17:29:50 +00:00
Treehugger Robot
b9e13e44d8 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-16 17:29:50 +00:00
Treehugger Robot
5ea61f6900 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-16 17:29:50 +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
Treehugger Robot
62c6c859fb [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: Ie338e611aa5e9840b9572c809b84fb34d8586575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:28:59 +00:00
Bill Yi
1b8cdb3c54 [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: I86b440f3d30c85fe51b77d1bc4af2da06fe35d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:28:55 +00:00
Treehugger Robot
b04d88f081 [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: I3a5703f75f3763d05931c8d7abc992e365aada7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:28:46 +00:00
Bill Yi
f7a1f6301c [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: Iff2068755443b1941a128c323904c6cd6c20067c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:28:37 +00:00
Bill Yi
0d737ffce4 [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: I098b4bfef9981e6ed0a1a46271b46e124bcec7fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:28:18 +00:00
Treehugger Robot
42e15a0ff5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-16 17:20:12 +00:00
Treehugger Robot
eb5aef41ff Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-16 17:20:12 +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
7f1150a448 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8a89870f9adf166a5ea4730b9c99c9adae7b704f
 2023-08-15 17:42:02 -07: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
55bf4eab3c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib467e8e41149b3f7535b421d2c83e7725d9a62e3
 2023-08-15 17:18:40 -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
33cf2a3dd6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I80e4d42c270ba65b724a78e18899c2e12082f1e1
 2023-08-15 11:07:44 -07: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
3c382e6941 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I107e068adba06990b1ce150bfcd4b29841220b23
 2023-08-15 11:04:13 -07: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
cf2c3e9981 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If7e2f5d483c30a6f1e841534bf2fde598ecd4986
 2023-08-15 11:00:29 -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