PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,934 Commits 1 Branch 0 Tags
76b51c0d5704f3e1ef53a377986900244ed6da3c
Commit Graph

84934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
55fec6e32e 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: Ife10fc8ec4813deb4e36c8ef404c9ef5106de7b9
 2021-06-16 06:33:09 +00:00
Kevin Chyn
0f6dac59c2 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: I2f24f3bd62f5a369c18ef12a721a36b28d3be4bb
 2021-06-16 06:32:50 +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
Kevin Chyn
35aa93d8d2 Pass context and enforcedAdmin to onClickListener 
These are apparently not available / not initialized in the
constructor. So, let's just pass it in from known entry points.

Bug: 188847063
Test: Builds
Change-Id: I5467f341ccf017ddfb31ef9fc4ef1756ebb65939
 2021-06-15 20:57:30 -07:00
Kevin Chyn
0c34d259a0 Show biometric-specific dialog when appropriate 
1) We need to pass a "restriction" string from settings to the dialog,
   otherwise the biometric dialog could be shown in non-biometric
   flows
2) Updates ActionDisabledByAdminDialogHelper to pass the restrition
   to be taken into consideration when creating the controller
3) Sets an optional onClickListener on the positive button.

Bug: 5788943
Test: atest ParentalControlsUtilsTest
Change-Id: Iedff7fef50e186b2779f061f37d3080c910d2179
 2021-06-15 20:57:26 -07: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
fc19953d28 Add biometric strings to DeviceAdminStringProviderImpl 
Bug: 190067596
Test: manual
Change-Id: I3a8f94fd6b2730164dff263f068543abd8d4d18b
 2021-06-15 19:58:53 -07: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
Peter Wang
3b03d484fb Use ICU style for choose_sim_text to handle special cases in RU 
Bug: 185406678
Test: Build
Change-Id: I43bf77b0b09ae4c2bb8b3acf976d996854a80866
 2021-06-15 18:27:34 -07:00
Joshua Mccloskey
8f06c94891 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: Ie397576862690543e8a086b0d31ce2b515a24988
 2021-06-16 00:19:06 +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
a9e0a0d2c9 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: I417868c232c53c08e45b80ff01de012259d7a09a
 2021-06-15 23:54:11 +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
Sally
d98ee531c1 Add labels to intensity slider and flip labels 
Labels are Dimmer and Brighter. As the slider value is lowered,
the dimming intensity is increased

Slider min = 100 - intensity max
Slider max = 100 - intensity min

Ex: If intensity max = 80, the slider min with be 20. If the user
moves the position to the minimum end we'll send 80 to Color DisplayManager

Test: atest ReduceBrightColorsIntensityPreferenceControllerTest,
manual
Bug: 190722076

Change-Id: Ib05ba38805b8fa1f68c144a3929027899df70abf
 2021-06-15 15:59:33 +00:00
TreeHugger Robot
11c290af4c [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: I9e425e2857f457b81e73ba4d156a24075a81b231
 2021-06-15 15:34:26 +00:00
Bill Yi
e4dec43c81 [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: I43f46e1bb2535fa9a250d9bade806fefec8de2b9
 2021-06-15 15:34:23 +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
f499ee9d0c 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: I38a3b51522cd0d5d2d26559c5ea7dde930ccd4ed
 2021-06-15 15:29:58 +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
8328eff4dd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-15 15:18:05 +00:00
TreeHugger Robot
e438ee94a1 [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: I021f7e67cc85b52f108146e5a01282983c9204ba
 2021-06-15 15:16:43 +00:00
TreeHugger Robot
4a60392fe6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-15 15:15:14 +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
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
aa175423f6 [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: I5d736fa841ac0ceac2511564a5eb1731fa6d2380
 2021-06-15 15:13:01 +00:00
TreeHugger Robot
d99ea16f1f [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: I887130ef39d637d70471d18562c506f1a87663bc
 2021-06-15 15:12:49 +00:00
TreeHugger Robot
c1a7c656d7 [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: I3fa36283732c14f8863e22d9086b685d9ec33f55
 2021-06-15 15:12:34 +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
Weng Su
22ce63ff6f [Provider Model] Show scanning sub-title once in the internet panel 
- Show "Searching for network" sub-title once when the Wi-Fi list is
empty

Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I1681593461c35160d6337056b2097aa4fdd8c3f8
 2021-06-15 22:58:26 +08: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
fdfebb9ff9 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: I88a6a60d78ee4e0b5fc37cdbb73c4b70f082466b
 2021-06-15 13:59:20 +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
249bbe6eb2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I73596799727795b1b40049069e52ee2980ffd937
 2021-06-15 13:29:45 +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
e9ab5389ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie1af168b28b1e86dfb6a741a8ef269dfb4011691
 2021-06-15 13:22:05 +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
b75edfa43d 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: Id84c3120ee7e2155df932246f997415143c4b69e
 2021-06-15 12:49:27 +00:00
TreeHugger Robot
91d1b6640a 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: Ic475adfb73db01568b37e557b6ba7b418de694fe
 2021-06-15 12:49:15 +00:00