Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,104 Commits 1 Branch 0 Tags
65aa5d7139ab2d1509b2201e650e32d5e507d05e
Commit Graph

37313 Commits

Author SHA1 Message Date
Kevin Chyn
65aa5d7139 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709 am: 16bd0c2cbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: I83bfdb503bbc5000b0fa24fa83ba734cdc7537fb
 2021-06-17 02:06:35 +00:00
Kevin Chyn
a5a6b946cc Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df am: 3551588761 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I9a8b1389008f5133cdbae6cf752352693e2c7662
 2021-06-17 02:05:27 +00:00
Kevin Chyn
ce05aa8bd4 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 am: da4aff8c65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I1983108d43a5e46b3a92a829624539b25db86e7a
 2021-06-17 02:05:25 +00:00
Kevin Chyn
da4aff8c65 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I52255ec8af862d982b38fecb42aee3aa275b87a4
 2021-06-17 02:01:23 +00:00
Kevin Chyn
5a8476a709 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev 2021-06-17 01:28:17 +00:00
Kevin Chyn
678a57b0df Merge changes from topic "kchyn-unicorn4a" into sc-dev 
* changes:
  Show biometric-specific dialog when appropriate
  Add biometric strings to DeviceAdminStringProviderImpl
 2021-06-17 01:27:00 +00:00
Abel Tesfaye
cc26673d5e Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188 am: 02c941968f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I177596b7d596184cbfe700389d2b4dd35b5b003b
 2021-06-16 17:55:45 +00:00
Abel Tesfaye
b8c610b188 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev 2021-06-16 17:25:48 +00:00
Stanley Wang
7a7b4242de Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev am: d0adfa7b3e am: 6cb273d8c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

Change-Id: Id3a3a1ef3cbb15bb06a92bc6bf406b2b723b4351
 2021-06-16 11:45:49 +00:00
TreeHugger Robot
3cc252d005 Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52 am: f8c5e7357e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888

Change-Id: I6339d4a88eff6e0f219e53933185372a391c9208
 2021-06-16 11:45:45 +00:00
TreeHugger Robot
4d4105462a Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3 am: 49d52d14fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: I6bedc054eb5bbc6c21ee7b3e528c11805db1e944
 2021-06-16 11:45:36 +00:00
Stanley Wang
d0adfa7b3e Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev 2021-06-16 11:42:00 +00:00
TreeHugger Robot
1803aead52 Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev 2021-06-16 11:38:32 +00:00
TreeHugger Robot
c0b23b03c3 Merge "Fix the toggle button flicker problem when display" into sc-dev 2021-06-16 11:19:22 +00:00
Stanley Wang
5da70e5205 Merge "Update the illustrations to Lottie format." into sc-dev am: 51308300ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934762

Change-Id: I0b6ddf29b264a60aab78bc8c7de65235a837ead0
 2021-06-16 09:38:25 +00:00
Weng Su
58ff170086 Fix the issue of permanent loading when Wi-Fi is disabled 
Bug: 173207801
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ib46c620f10987ba52787aae8b5beddb5c68e0e17
 2021-06-16 17:26:12 +08:00
Stanley Wang
51308300ef Merge "Update the illustrations to Lottie format." into sc-dev 2021-06-16 09:24:55 +00:00
TreeHugger Robot
179a97663d Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879

Change-Id: I23d20a3052c72bc4e804c2e0482df9405923732d
 2021-06-16 08:53:43 +00:00
TreeHugger Robot
059b3fab8e Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev 2021-06-16 08:32:16 +00:00
Kevin Chyn
a7d250d29b Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

Change-Id: I06c671aa0b468dac1893acf6754d9633360ed41a
 2021-06-16 08:08:16 +00:00
Edgar Wang
a8136d8d43 Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881

Change-Id: Idbbe5d2b13af8003fa54494ba3e4fe9e875658f0
 2021-06-16 08:07:54 +00:00
Kevin Chyn
826df7ae78 Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev 2021-06-16 07:55:01 +00:00
Edgar Wang
fce6e1772a Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev 2021-06-16 07:54:47 +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
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
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
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
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
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
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
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
Zimuzo Ezeozue
653e7c91c8 Merge "Turn off transcoding notification by default" into sc-dev 2021-06-15 13:49:19 +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
TreeHugger Robot
ab04f86066 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev 2021-06-15 12:36:38 +00:00
Stanley Wang
09fd6ca720 Update the illustrations to Lottie format. 
- Add the fake illustrations to Settings.
- Update the illustrations of the following items.
  Adaptive battery
  Swipe fingerprint for notifications
  Quick open camera
  Flip camera for selfie
  One-hand mode
  Tap to check phone
  Lift to check phone
  Prevent ringing

Bug: 190807662
Test: robotest and see the UI
Change-Id: I39c72570c61b0871ab5949ecca9a99d5404d1811
 2021-06-15 20:23:04 +08: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