Commit Graph

82754 Commits

Author SHA1 Message Date
Kevin Chyn
928f3a28dc 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: I3924b671dbe1336e39fd153b5b809a2e3b7e3669
2021-06-16 06:33:49 +00:00
Kevin Chyn
24b81dcffb Merge "Convert biometrics to RestrictedPreference" into sc-dev 2021-06-16 06:13:04 +00: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
5214307f79 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: I2ef317f99c2f27223b31646ba74129426e32f253
2021-06-16 00:19:49 +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
a9d081fb66 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: Ic5c1d44105acd3f77cbcb0e0666440b184f97ba9
2021-06-15 23:56:05 +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
d15259021a [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: I215da74523dde305bba0f106ff222c61353d39f9
2021-06-15 15:31:06 +00:00
Bill Yi
cd62dd50ca [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: I8948b361a06a64cc25aada0d21b520e494dd86b6
2021-06-15 15:31:02 +00:00
TreeHugger Robot
2ab7842fd3 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: Id9bc642aa5326e192c1ba39b0118f5bf98478066
2021-06-15 15:30:58 +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
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
82906da38d [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: Ic07aacf2b2c552c9d77e0ae520aa52365a8b2974
2021-06-15 15:14:16 +00:00
Bill Yi
b536f17a93 [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: Iaed3a41a0fa184eac17a63b68e5bf8413306dbf5
2021-06-15 15:14:10 +00:00
TreeHugger Robot
27f38d3b75 [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: Icee6dbc7b8d2569a779d4595dafba33be971a935
2021-06-15 15:13:52 +00:00
TreeHugger Robot
93d2962588 [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: I8396363e05002a19f16293d8258ba2f8d11839ee
2021-06-15 15:13:32 +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
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
TreeHugger Robot
f50af259f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-15 14:55:23 +00:00
TreeHugger Robot
de9d41cbf3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-15 14:50:11 +00:00
Zimuzo Ezeozue
0d7177ec77 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: Ic154883cd65ff1a45afecd54670211ce6f01b1b5
2021-06-15 14:00:07 +00:00
Bill Yi
a4c6739489 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia06fc82725960767bbbda83b4c51aed746ae4968
2021-06-15 13:54:43 +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
061292144e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icfd19de01cd116b105b5d947d41d13b4c58baa5f
2021-06-15 13:43:16 +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
b4792f2f69 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: Ibae55a27a309f3fcd96846f5ca25a7bdbc5cfdf1
2021-06-15 12:50:22 +00:00
TreeHugger Robot
1250d8e5b8 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: Iff9a36424bb8db246b8fb8018cde20d19b483b67
2021-06-15 12:50:06 +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
db65894caa 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: I2e8581960e9fce769d0a8fde057d8582cbd22c2b
2021-06-15 11:36:58 +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
6117cfbaad 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: I18ce09ecc9cebe0424f564c587d27545b7e58b47
2021-06-15 10:19:10 +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
37a2aed385 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: Icb4cafb51fe77a836b2cfa7dae1dd2cd382715a5
2021-06-15 09:36:59 +00:00
TreeHugger Robot
72ce05c82e 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: I955d19d4ec913270fb6441f26e8d7dd2ca411b42
2021-06-15 09:36:51 +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
c567927880 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: I1a58e0c64d0d9f86c8d048b672299d85f3da8429
2021-06-15 09:20:02 +00:00