PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,080 Commits 1 Branch 0 Tags
0197a01a8225d138c12ae5ba35438e235322739c
Commit Graph

84080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
333ed02859 Merge "Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c am: 17c78b63e0" into sc-v2-dev-plus-aosp 2021-06-16 06:46:48 +00:00
Kevin Chyn
eaa04db965 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c am: 17c78b63e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

Change-Id: I94d43b8a33fb094b230933670d1395adebd2e8a2
 2021-06-16 06:46:37 +00:00
Kevin Chyn
65a73cc262 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c am: 280958df64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

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

Change-Id: Ia39335c987634626c3072bc7da8fed31ba05b6c7
 2021-06-16 06:46:23 +00:00
Kevin Chyn
9047c5baac Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb am: 928f3a28dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710

Change-Id: I696220ca9c471713a2a2bec4e205d2e782d616e6
 2021-06-16 06:46:18 +00:00
Kevin Chyn
280958df64 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: Id4f76650ab5ae8f906eb9cba64e465c65ec57cf4
 2021-06-16 06:34:12 +00:00
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
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
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
Sunny Shao
794a894aa7 Fix testGetDeviceOwnerDisclosure test case fail 
- Remove the learn more part which already include in the FooterPreference.

Fixes: 190889944
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImplTest
Change-Id: Ia6b7962019a3ec30b72ca6d64159811ab98fc13b
 2021-06-16 13:40:55 +08:00
Sunny Shao
9fa4bb8ffa Fix the toggle button flicker problem when display 
- Root cause: the side effect of the parallel controller loading.
- Solution: disable the parallel approach and remove the entry point
  of parallel approach in DashboardFragment.

Fixes: 187838753
Test: Robo test for AppInfoDashboardFragment, ConfigureNotificationSettings,
      ConnectedDeviceDashboardFragment, DevelopmentSettingsDashboardFragment,
      NetworkDashboardFragment, DashboardFragment
Change-Id: If3b09c4fd6f33042e0ed38704f08e855ab8f5377
 2021-06-16 11:41:10 +08:00
Kevin Chyn
add8de49e9 Move testAlwaysRequireConsent to frameworks/base 
Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I1c374b0e0e051a2e911d4586f7f2f9928c9de260
 2021-06-15 19:58:47 -07: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
cf0bcde113 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 am: c5b5317ef2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I9117a171d4322c43f7fa543e092c76c0d1a64468
 2021-06-16 00:34:40 +00:00
Joshua Mccloskey
e9649e3d09 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 am: 5214307f79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I8db3d12ed220e7f3913c10e70ddd8421b6b7fa87
 2021-06-16 00:34:21 +00: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
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
Peter Wang
4d7d0bf049 Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b am: 6fb591f769 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: Id07ebce31feb4eb63872bdb6e338ba4eb209369e
 2021-06-16 00:09:57 +00:00
Peter Wang
999e19ee8e Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b am: a9d081fb66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: I9c22393c0faf6df8fab96d635cf3ece396974dc9
 2021-06-16 00:09:29 +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
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
Edgar Wang
1e3c0115a5 Tweak SeekBarPreference to folow new Settings UX design 
Bug: 186068091
Test: visual verify
Change-Id: I2cd7f57a75f8512080e9b5e891c27db6297b0729
 2021-06-16 03:47:36 +08:00
TreeHugger Robot
e2a9ccb1bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -s ours am: d15259021a -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: I4fc3cb4426e6c761baa69944e86a661ac13fbc27
 2021-06-15 15:52:08 +00:00
Bill Yi
7b2eb38321 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -s ours am: cd62dd50ca -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: I8d1c99ea0caa38a6a45cd1401ef84fd40dc9560d
 2021-06-15 15:52:03 +00:00
TreeHugger Robot
a44653afd5 Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958 am: 2ab7842fd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755

Change-Id: Icf6d5acfcec494f060ba8c5e8b97be367bf40c1c
 2021-06-15 15:51:39 +00:00
TreeHugger Robot
5af65de4c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -s ours am: 8d694a6948 -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: I5eb038b0a2dba25dbac0b12952b566903bfc9ed1
 2021-06-15 15:43:35 +00:00
Bill Yi
dded88366d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -s ours am: 4ca76e5213 -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: I64e1a997b40be1bc1643f638477f357d116493d9
 2021-06-15 15:43:25 +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
a1dd2d6483 Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958 am: 3fd1df4e04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755

Change-Id: I7ffe099c59923a6f26a1c5214ddc92414b4f1d2b
 2021-06-15 15:31:32 +00:00
TreeHugger Robot
d017b2031a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours am: 575e06dbb1 -s ours am: bf67fa399d -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: Iad1375504a4ab00c96b8f512ad1e03d155a171f0
 2021-06-15 15:31:28 +00:00
Bill Yi
7e156a74bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours am: cb28fd1d30 -s ours am: 9d3a9178ff -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: Ic8c2432093175f9dc2170aeb8b18bee75eb2bdd1
 2021-06-15 15:31: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
TreeHugger Robot
1baebdb976 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c -s ours am: 8b70eba471 -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: I9a55b97c4d72e74cf82b3cb1df2d962ee7ebd2c1
 2021-06-15 15:31:05 +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
a5bffcc5b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57 -s ours am: bff71db6fb -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: I6de5b339c352b12af3db8ae1872d499023034339
 2021-06-15 15:30:55 +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
d50cb3f9df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours am: 575e06dbb1 -s ours am: 82906da38d -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: Icd842e1dd4a63a1bf35c209c8d96413eda9754d9
 2021-06-15 15:15:06 +00:00
Bill Yi
45403527b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours am: cb28fd1d30 -s ours am: b536f17a93 -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: I6b81ae96d90c8af6abc7e6e6ab70aecf60d4253f
 2021-06-15 15:15:01 +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
61ad461a0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c -s ours am: 27f38d3b75 -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: I2528108d1567c9d4592f5e2372b9b6fdcda1741d
 2021-06-15 15:14:38 +00:00