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

133473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Chao (zhào-yò)
357a2243fa [automerger skipped] Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev am: 8053947766 am: c9eca99ac1 -s ours 
am skip reason: Merged-In I26531afe75215c9531c0122d2e86fd5d0da4d3db with SHA-1 f9ca569249 is already in history

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

Change-Id: I2550b66bb19c7ec11e22fec0a275050ff7c38db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 07:43:08 +00:00
Weng Su
28be567a83 Show policy transparency dialog for Wi-Fi network restrictions 
- In order to support various user restrictions of individual Wi-Fi networks, WifiEntry provides the hasAdminRestrictions method for unified management.

- Settings will refer to WifiEntry#hasAdminRestrictions to restrict individual Wi-Fi networks.

Bug: 289448751
Bug: 289951241
Test: manual test
atest -c LongPressWifiEntryPreferenceTest

Change-Id: Iae5996a87ee72a3073300c7f62dfa14a9f31c21d
 2023-08-04 07:18:28 +00:00
Yu Chao (zhào-yò)
c9eca99ac1 Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev am: 8053947766 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24305937

Change-Id: I92ce6470673a5c7d36dd188bdb80902cb1103901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 07:01:45 +00:00
Yu Chao (zhào-yò)
8053947766 Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev 2023-08-04 06:28:05 +00:00
Yu Chao
68e466ff01 Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment. 
This is required for adding an overlay vpn_settings2.xml for Tips
Button.

Test: VpnSettingsTest
Bug: 293213974
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f9ca569249331a062e6f58a49bb0bb53aa69b3db)
Merged-In: I26531afe75215c9531c0122d2e86fd5d0da4d3db
Change-Id: I26531afe75215c9531c0122d2e86fd5d0da4d3db
 2023-08-04 05:51:48 +00:00
Chaohui Wang
4000b90fad Merge "Remove context from enterprisePrivacyFeatureProvider" into main 2023-08-04 04:31:44 +00:00
Justin McClain
636f2888d7 Merge "Adding test directory owners file." into main am: e354820db7 am: b3c19b8057 am: 1f656a8734 am: d31a0c8d22 am: e214825dfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366

Change-Id: Id6fedd7d539c37c84d23efedc4377d6f210d5166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 03:37:43 +00:00
Zoey Chen
a1b214ea5c [automerger skipped] Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev am: 9635d1cf45 am: 2a2a50e4f2 -s ours 
am skip reason: Merged-In I0d1a2de93ad2911c555acef2f4e00cd715c62f17 with SHA-1 0f70d8d690 is already in history

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

Change-Id: I7c403d80cfa5b1515cadea150dd25a98111043c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 03:36:05 +00:00
Bill Yi
d56eb42615 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I88df717cf88e78ce5cbe17b53f50dbccf03aecf2
 2023-08-03 20:29:24 -07:00
Bill Yi
74fd980e5f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9dc5389350ec7cb3c1988eb69fc5c23c5c50707d
 2023-08-03 20:27:38 -07:00
Bill Yi
d447dcfcea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36696445b89cb0d0dd94aa210d559a6c60a79d82
 2023-08-03 20:21:12 -07:00
Justin McClain
e214825dfa Merge "Adding test directory owners file." into main am: e354820db7 am: b3c19b8057 am: 1f656a8734 am: d31a0c8d22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366

Change-Id: I3973e5f5ef8edc2747146024e5d77b7f6abb4b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 03:14:25 +00:00
Zoey Chen
2a2a50e4f2 Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev am: 9635d1cf45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24257533

Change-Id: I7f82cb95528fe96829f896ee5cb762ab401dd0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 02:54:30 +00:00
Justin McClain
d31a0c8d22 Merge "Adding test directory owners file." into main am: e354820db7 am: b3c19b8057 am: 1f656a8734 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366

Change-Id: I0ad2cbc29e05332110246c6eee41070461bb5f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 02:31:33 +00:00
Zoey Chen
9635d1cf45 Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev 2023-08-04 02:20:11 +00:00
Justin McClain
1f656a8734 Merge "Adding test directory owners file." into main am: e354820db7 am: b3c19b8057 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366

Change-Id: I9f74c2572c5fa47fb369679093bc5d6163169f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 01:43:57 +00:00
Bill Yi
a0ea2b3e9e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6ea5a99d88d0c86e97285b443fb9a5d07ab7d3ed
 2023-08-03 18:10:32 -07:00
Justin McClain
b3c19b8057 Merge "Adding test directory owners file." into main am: e354820db7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366

Change-Id: I98190d9ea45f20f7134704324f10c2b79ebe322c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 00:59:32 +00:00
Bill Yi
031764a37e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb4f0fad54cd19b36bab1f95675a1a006a65734d
 2023-08-03 17:55:41 -07:00
Bill Yi
fa3cf49a9b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie206cb42c7e9c18e050ea7d48a65adbb88aaca5f
 2023-08-03 17:53:18 -07:00
Bill Yi
1f84be1b75 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I521cc7bc8a3250f2642ecf78b7365062c15ae1fa
 2023-08-03 17:46:54 -07:00
Bill Yi
8a43b3166b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I829a57291b2d2ca97f27909a348ab19bec2dbaaa
 2023-08-03 17:44:47 -07:00
Justin McClain
e354820db7 Merge "Adding test directory owners file." into main 2023-08-04 00:19:27 +00:00
Yuyang Huang
6ddcbd5883 [automerger skipped] Merge "Enable/Disable ASHA profile with LE audio toggle" into udc-qpr-dev am: b40e5c2228 am: 325cd61f8c -s ours 
am skip reason: Merged-In I3c5c9012c167b920e484b39374fe8174191b094d with SHA-1 f79e084bd0 is already in history

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

Change-Id: I469a40af22ba655032b72afe1b076c3b1aa3eed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 23:49:59 +00:00
Yuyang Huang
325cd61f8c Merge "Enable/Disable ASHA profile with LE audio toggle" into udc-qpr-dev am: b40e5c2228 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23919023

Change-Id: I024ffb878311a911b6acd93c77f4136fed2e912b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 23:05:35 +00:00
Yuyang Huang
b40e5c2228 Merge "Enable/Disable ASHA profile with LE audio toggle" into udc-qpr-dev 2023-08-03 22:20:35 +00:00
Bill Yi
898dbb5784 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: f2b96ee21a -s ours am: 558c26769c -s ours am: c2243b610a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia843b7cefc2d492722da937207f882c3cba73104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 22:01:25 +00:00
Automerger Merge Worker
5bea69a957 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: c9c69ea360 -s ours am: 9367464e52 -s ours" into udc-qpr-dev-plus-aosp am: 8b4a373998 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie59ae4ffd1560e0063f20fe6cc0cd95461397741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 22:01:12 +00:00
Bill Yi
f19ebcb301 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: c9c69ea360 -s ours am: 9367464e52 -s ours am: f1f62b352c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f7c024b79cdc14b3dc265508cb82fa3b488a5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 22:01:09 +00:00
Bill Yi
a0f275a513 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: c9c69ea360 -s ours am: d30110938b -s ours am: af556233d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id49f20e4a21408870110e7364b6941aef05ad1c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 21:59:11 +00:00
Bill Yi
c2243b610a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: f2b96ee21a -s ours am: 558c26769c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0de233dacf5471572e62551112cb166e14789c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 21:13:11 +00:00
Automerger Merge Worker
8b4a373998 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: c9c69ea360 -s ours am: 9367464e52 -s ours" into udc-qpr-dev-plus-aosp 2023-08-03 21:11:30 +00:00
Bill Yi
f1f62b352c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: c9c69ea360 -s ours am: 9367464e52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a1ae6c7613ccff26f3d41d87146929e310e743a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 21:11:20 +00:00
Bill Yi
af556233d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: c9c69ea360 -s ours am: d30110938b -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Iacac202218bc55ef63d7c123db16fac26c554e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 20:29:06 +00:00
Bill Yi
558c26769c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: f2b96ee21a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icaa30ad319e6e53646f8c4869205c27c4b2d1d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 20:28:46 +00:00
Bill Yi
0975bc739c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: 5c84922740 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic05c630a2b77cac4d8dfab1b08b53f5ca8e841e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 20:28:25 +00:00
Bill Yi
9367464e52 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours am: c9c69ea360 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3af9bf6002860f11db00b5b8d0c3340741db7cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 20:27:46 +00:00
Bill Yi
5c84922740 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2baa90b1e2e99513f1ed5254a3f1025ef79bc41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 19:45:08 +00:00
Bill Yi
f2b96ee21a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8f0953fe6a2b2d6d74397b4e34f2dc41980c735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 19:44:21 +00:00
Bill Yi
c9c69ea360 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia533f5f510595ee2d748364f1e30e8b8a9a4a911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 19:43:11 +00:00
Bill Yi
c52abcd3fa Import translations. DO NOT MERGE ANYWHERE 
BUG:291684185

Auto-generated-cl: translation import
Change-Id: Ia444bb69cc499bd8d4a5ffc8c72babdda213c385
 2023-08-03 11:04:31 -07:00
Etan Cohen
0fb1a3b3a7 Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces 
Increase robustness of QR code parsing: while leading spaces aren't
expected (or allowed) they are observed in the wild and can be safely
ignored.

Bug: 292331368
Test: validated that QR code with scan is now parsed correctly
Test: atest WifiQrCodeTest
Change-Id: Ifff79870bea2ec9924f7b2e8100c2c01fd350846
 2023-08-03 14:25:38 +00:00
Martin Stjernholm
8d5577af57 Merge "Revert "Clean up unused WifiManager.ActionListener"" into main 2023-08-03 13:51:54 +00:00
Martin Stjernholm
c4a0abef8c Revert "Clean up unused WifiManager.ActionListener" 
This reverts commit a2adee5362.

Reason for revert: Breaks build - b/294364808

Change-Id: I4f323c2fc43dddbf2f2dd0e323f026727263c99e
 2023-08-03 13:46:27 +00:00
Chaohui Wang
26e4d39680 Merge "Not to retrieve Preference_title" into main 2023-08-03 13:42:48 +00:00
Treehugger Robot
b7db2a6ff3 Merge "Clean up unused WifiManager.ActionListener" into main 2023-08-03 13:23:46 +00:00
Justin McClain
1b19dd472e Adding test directory owners file. 
Test: m
Change-Id: Icbf936ab1b2da5269eb41c2c04001a6a6ff41a3a
 2023-08-03 12:54:32 +00:00
Zoey Chen
bebaec607e Merge "[Regional Preference] Add description for checked/not checked" into main 2023-08-03 11:30:42 +00:00
Graciela Putri
a321c8969e Merge "Add intent to access aspect ratio app list page" into udc-qpr-dev am: 830c9eec71 am: 4488c05a48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24264905

Change-Id: Iec4bc825314e4637880d1536d3ba83031b995e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 09:46:17 +00:00