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

133393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
1b5f0de9bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours am: 15cc28174c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d678ad2ed4861198a6f0212251cc58da571c60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 21:27:37 +00:00
Bill Yi
b1fd906ca0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: af43c501e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0471e7877dec7ef871218806ab38e37d1e348b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 20:53:12 +00:00
Bill Yi
a71fa5cbcb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ffb7fc9f1f9285984b1b900338d2077a0d2703b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 20:45:40 +00:00
Bill Yi
15cc28174c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1046b5ffb4a54a95a0f4406038b7c9862b137563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 20:44:19 +00:00
Bill Yi
f30fab1202 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f -s ours am: 5d99f9e9c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b03d44f414fd4ff2b3b32f73c658fdb8fc8590e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 20:17:30 +00:00
Bill Yi
bdf848f6aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0ed2cf9aee487bcec814bc39c50a5c1aab5f005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:58:55 +00:00
Bill Yi
af43c501e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9e098c8e0a6efbcc02f159772638b6549dc139f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:58:50 +00:00
Bill Yi
109fb512b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f -s ours am: b8d9ca8b86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6059189741ee34ac105c261d991910250d2edbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:55:47 +00:00
Bill Yi
b8f4dd6e0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9b01d4dd30afbe01e3777c89da2a3db86943ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:54:35 +00:00
Bill Yi
b8d9ca8b86 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9d027022ed5817aa9eaca923edd1161f1b6c1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:36:33 +00:00
Bill Yi
5d99f9e9c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib39e135bf9f52b9a0ef8019c3a48d1e062138afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:35:31 +00:00
Treehugger Robot
940a9b9d3e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-04 19:22:48 +00:00
Treehugger Robot
048a8ef3a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-04 19:22:48 +00:00
Treehugger Robot
06de7758b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-04 19:22:48 +00:00
Bill Yi
f3ddb4a624 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If487bb3281585de22121dd4240bb566be4584ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:15:48 +00:00
Liahav Eitan
e30a1c19ec Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev am: 804104ce36 am: daf168e2b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23845009

Change-Id: I2c19e08ef9f24514fb8e298d97e7f98424a369aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 18:46:10 +00:00
Liahav Eitan
daf168e2b9 Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev am: 804104ce36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23845009

Change-Id: I92f8814c34e868d93500c137a2d4428937d50320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 18:02:56 +00:00
Riley Jones
89221666db Merge "Expanded accessibility search terms" into main 2023-08-04 17:57:53 +00:00
Liahav Eitan
804104ce36 Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev 2023-08-04 17:19:02 +00:00
Weng Su
de6eb9100f Show policy transparency dialog for Wi-Fi network restrictions am: 28be567a83 am: cac69880ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156648

Change-Id: I8c69cfc85156917c0223817fe4409f9b6357f05c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 17:14:21 +00:00
Weng Su
cac69880ae Show policy transparency dialog for Wi-Fi network restrictions am: 28be567a83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156648

Change-Id: I5e5ebdc0aedc686e7a4257458d68592ea51c883b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 16:36:08 +00:00
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