PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,026 Commits 1 Branch 0 Tags
17c78b63e0a14b0388cd9346efd9dc4aa3548fd0
Commit Graph

83026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
17c78b63e0 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

Change-Id: I5ca66b5d001708cbd9b28a125c383fe2fb6f4de1
 2021-06-16 06:33:50 +00:00
Kevin Chyn
70fabc4900 Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710

Change-Id: I4e7bbaea57094840b1ae0b0a1184bcb759a913f5
 2021-06-16 06:33:07 +00:00
Kevin Chyn
44a0ddaa4c Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev 2021-06-16 06:13:17 +00:00
Kevin Chyn
24b81dcffb Merge "Convert biometrics to RestrictedPreference" into sc-dev 2021-06-16 06:13:04 +00:00
Kevin Chyn
ee3ca1506a Update to use ParentalControlsUtilsInternal for common logic 
Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I14ba3683f846ad7ff6e9f2eb5013d9033556e706
 2021-06-15 19:58:41 -07:00
Kevin Chyn
9af27677e9 Convert biometrics to RestrictedPreference 
Bug: 188847063
Test: adb shell settings put secure com.android.settings.biometrics.ParentalControlsUtils.always_require_consent 1
      Preference becomes gray with an info icon
Test: atest ParentalControlsUtilsTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=FingerprintStatusPreferenceControllerTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=FaceStatusPreferenceControllerTest

Change-Id: I929c11606eec76063f7b060fdc5cb2b5f60a80e2
 2021-06-15 19:57:04 -07:00
Joshua Mccloskey
c5b5317ef2 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I4e54f9189a9e47dc043ded6fbae1ce1e0656d9a3
 2021-06-16 00:18:57 +00:00
Joshua Mccloskey
19baf0df84 Merge "Update multi biometric flow for SUW" into sc-dev 2021-06-16 00:07:16 +00:00
Peter Wang
6fb591f769 Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: I340b7f256b0df90d50a90320fd5628968332bd6e
 2021-06-15 23:55:21 +00:00
Peter Wang
faac8d0f4b Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev 2021-06-15 23:42:24 +00:00
TreeHugger Robot
8d694a6948 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c0594d5b037d35c13634bb6be695f5e1a108cda
 2021-06-15 15:34:21 +00:00
Bill Yi
4ca76e5213 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5fe840eb53eb3da644934c71e7ecca433f6c841a
 2021-06-15 15:34:18 +00:00
TreeHugger Robot
d22c1aaaeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e6506656caa7aa169958a446318a53ebab58ff0
 2021-06-15 15:30:43 +00:00
Bill Yi
c42235e677 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fbcf1ae14ce66253ed94265bcb3dbb32c9cdc92
 2021-06-15 15:30:28 +00:00
TreeHugger Robot
3fd1df4e04 Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755

Change-Id: Icefd1b02303f58db22ec3b759359658077bf999f
 2021-06-15 15:29:55 +00:00
TreeHugger Robot
bfe1d39958 Merge "Integrate One handed mode shortcut preference" into sc-dev 2021-06-15 15:25:13 +00:00
TreeHugger Robot
33ddf7c74d Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-15 15:14:44 +00:00
TreeHugger Robot
bf67fa399d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours am: 575e06dbb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffcd7847f37e253e32b2af6dd8167951e6b8e1c9
 2021-06-15 15:13:44 +00:00
Bill Yi
9d3a9178ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours am: cb28fd1d30 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id948569867f68a42b30f8a7ced7efec6e5a7ddfa
 2021-06-15 15:13:31 +00:00
TreeHugger Robot
575e06dbb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39c51016f6aa5fd5f6133bf3ef730c68faa39755
 2021-06-15 15:13:28 +00:00
TreeHugger Robot
8b70eba471 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8bbf31ee7b747cf37bc15fc838e17eaed51ea756
 2021-06-15 15:13:07 +00:00
TreeHugger Robot
bff71db6fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddd26cd22b50f21e38487f130d2d7aa3eb9945e2
 2021-06-15 15:12:37 +00:00
Bill Yi
cb28fd1d30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2412a5d6b1ec925ca9b9e8404b75110519b9809
 2021-06-15 15:12:33 +00:00
TreeHugger Robot
51f4ffc818 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-15 15:02:11 +00:00
TreeHugger Robot
c2989e3d1c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-15 14:57:42 +00:00
TreeHugger Robot
59205fce57 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-15 14:56:52 +00:00
Zimuzo Ezeozue
791f95c8a7 Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377

Change-Id: Ifb289ac030f62f3963a81c1808c80ada47c574c5
 2021-06-15 13:59:17 +00:00
Bill Yi
af994f1ee2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie1f5759a3bb75dc44970be04baff77093925ef39
 2021-06-15 13:50:46 +00:00
Zimuzo Ezeozue
653e7c91c8 Merge "Turn off transcoding notification by default" into sc-dev 2021-06-15 13:49:19 +00:00
Bill Yi
94ab13af15 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8ed8b655dd1025abc355482a2b85489c47f8cb6e
 2021-06-15 13:41:45 +00:00
Bill Yi
acf3c5c098 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibdaa7a59ef596ef9bbcd939ba148b62c972100c4
 2021-06-15 13:37:16 +00:00
Bill Yi
532ae047f0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia1ba0b60387c6aa399159adb1d5f0f5dc2bb9f79
 2021-06-15 13:33:58 +00:00
Bill Yi
e2b8fbafa3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I38b2b159f3e0003a8ad9702a5b24c88cf8b5d7cc
 2021-06-15 13:25:35 +00:00
Bill Yi
a333febed9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic1ba09681a73f7f35074acdfcd16e282b4100f8d
 2021-06-15 13:20:30 +00:00
Menghan Li
a9a5876ed6 Merge "Add strings for use accessibility gesture" into sc-dev am: 92aaef1dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934763

Change-Id: I8eabff5bcc8d970546feb24df3391c04c29f745f
 2021-06-15 12:49:27 +00:00
TreeHugger Robot
5ea704f690 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: Ia5b3b52894f3df2b4e3bdf655a98e61b94425e9c
 2021-06-15 12:49:20 +00:00
Menghan Li
92aaef1dac Merge "Add strings for use accessibility gesture" into sc-dev 2021-06-15 12:43:16 +00:00
TreeHugger Robot
ab04f86066 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev 2021-06-15 12:36:38 +00:00
Syaoran Kuo
394955220f Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: Ie1a623195806655f7f80832ad2d86d3865dd991a
 2021-06-15 11:36:12 +00:00
Syaoran Kuo
66eaa371ff Merge "Fix resource id not match issue." into sc-dev 2021-06-15 10:48:58 +00:00
Peter Wang
130ac0729b Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I0d1c251e892da779e70c5078cb7cd22af754dd87
 2021-06-15 10:18:22 +00:00
Peter Wang
03d2f8d749 Merge "Use BC theme for ChooseSimActivity" into sc-dev 2021-06-15 10:02:34 +00:00
Peter Wang
d368e85c2e Use translated name ("SIM") for default profile display name ("CARD") 
Bug: 186156909
Test: Local
Change-Id: Icb8e5e7afb64d28e1ff7567882288fb1621dbe9a
 2021-06-15 02:59:21 -07:00
Weng Su
58a651566f [Provider Model] Remove Wi-Fi disconnect action 
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: I964bf8de4f5eee1523943876567bf565ccb7f995
 2021-06-15 17:43:31 +08:00
TreeHugger Robot
57c1cb6209 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I8757ccca71cf6efd33dc8b3f539fad4dadd35ff1
 2021-06-15 09:36:10 +00:00
TreeHugger Robot
c497a9602b Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I700f9a5a773862358e19ded911f634962571aa4f
 2021-06-15 09:36:04 +00:00
TreeHugger Robot
2ff8b363da Merge "Add loading progress to Internet Settings" into sc-dev 2021-06-15 09:24:27 +00:00
TreeHugger Robot
1ce0d1117e Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev 2021-06-15 09:23:58 +00:00
TreeHugger Robot
339c1b5d12 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I489bda723baaeedec879e5d973d5b5f066086455
 2021-06-15 09:19:13 +00:00
TreeHugger Robot
153c3a1dc2 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev 2021-06-15 09:11:18 +00:00