Commit Graph

38291 Commits

Author SHA1 Message Date
tom hsu
a2402aba83 [Settings] Prevent crash from abnormal behavior.
- The problem is user remove SIM when stop in ApnSettings page, and do
 unexpected operation.

 - To figure out this problem, listen SIM absent event and make activity
 finish at this moment.

Bug: 189909956
Test: Manual test.
Change-Id: I179c708debcbc31ba9a93e4e434ae810051f5004
2021-06-17 07:28:53 +00:00
Sunny Shao
073addda54 Fix Learn more link placement is wrong problem
- Use the new style of the FooterPreference.

Fixes: 190951058
Test: manual test
Change-Id: I33d30f00b3785f5195e38e3e26524dd93971d486
2021-06-17 13:47:32 +08:00
TreeHugger Robot
8f0f77746a Merge "Update "Unused apps" load-in UI" into sc-dev am: 2110a5b95e am: dcb3e6450d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970514

Change-Id: I28b604b737992afd150c989981104c8fd8edfc20
2021-06-17 05:15:34 +00:00
TreeHugger Robot
4af87c0cbd Merge "Update "Unused apps" load-in UI" into sc-dev am: 2110a5b95e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970514

Change-Id: I788449f044000739ce5084b361a4091163799e27
2021-06-17 05:01:34 +00:00
TreeHugger Robot
2110a5b95e Merge "Update "Unused apps" load-in UI" into sc-dev 2021-06-17 04:52:08 +00:00
Kevin Chyn
39d2a2def1 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709 am: b8486ee467
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: Id1de8f9d9bc4625206f26472ea237ce4392ee037
2021-06-17 02:15:45 +00:00
Kevin Chyn
8979a18492 Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df am: 8cf5ca3382
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I20f74bed342e97a22bf1aa5f3e74a70821f86270
2021-06-17 02:13:46 +00:00
Kevin Chyn
e51d57b2c0 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 am: e9da6b3e58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I2e349a404656258bbf59370aece87577e90dedd2
2021-06-17 02:13:43 +00:00
Kevin Chyn
f721b1d9a6 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

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

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

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

Change-Id: I7ba4cfa16a8154d482f193aa2713b5b06b21e7a4
2021-06-17 02:00:38 +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
Julia Reynolds
393134f9b1 Validate config activities with their rule owners
Test: RoboTests
Bug: 189332346
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2021-06-16 15:40:34 -04:00
Abel Tesfaye
750ca2fc67 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188 am: e8d7346216
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I4bc8555dd7ec1703fa61e8717f075e8d626d6e56
2021-06-16 17:55:15 +00:00
Abel Tesfaye
839f9e6319 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I57c511d4bbebeb18c57b51009e3e1c7fda232467
2021-06-16 17:39:15 +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
Joe Bolinger
a8808f7368 Add plumbing and placeholder screens for parental consent flow.
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest
Change-Id: Ie136036d5f550775fd0b021979581a5d222f1b68
2021-06-16 09:58:19 -07:00
Stanley Wang
932b4d4505 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: d9f6bf7461
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

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

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

Change-Id: I9180a7d2471436b9619ceaafac0ad945ac4ce16a
2021-06-16 11:45:12 +00:00
Stanley Wang
2773b42560 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

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

Change-Id: I7c1501692a5d09bd4fad1369ac50eb7c6f9d7f2a
2021-06-16 11:44:59 +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
bf2fae3df5 Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: I7ec1c5fe717c5103dcb43fe48672724bc2abba77
2021-06-16 11:32:06 +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
40f1be96d7 Merge "Update the illustrations to Lottie format." into sc-dev am: 51308300ef am: c4427c7878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934762

Change-Id: Ia4d5a8212e71f2024cad143b26e23fae1047b861
2021-06-16 09:51:08 +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
e3dbb8f637 Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e am: 46cd409eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879

Change-Id: I2293bc2f62f15a910223c69bbbcbad628d60119d
2021-06-16 09:09:15 +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
c211d18e1b Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 am: aa2b29b5ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

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

Change-Id: I7405fe05ddf77999218e3de74225c73b8102acd4
2021-06-16 08:10:14 +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
8903432b39 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c am: 55fec6e32e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

Change-Id: Ia4b774b754d78f6595778c130129ff6c0e57c6bd
2021-06-16 06:47:11 +00:00
Kevin Chyn
0b121f260d Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb am: 0f6dac59c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710

Change-Id: Ib153b57a8285a590d9e344cfda0c8ef4360a3bde
2021-06-16 06:46:17 +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