Commit Graph

84174 Commits

Author SHA1 Message Date
TreeHugger Robot
1da2a5390a Merge "Add One-handed mode entry point in a11y system controls" into sc-dev 2021-06-16 11:35:43 +00:00
TreeHugger Robot
49d52d14fe 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: I5a6cd20b1d624d151a052e0898fe072d73acef33
2021-06-16 11:33:09 +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
TreeHugger Robot
643dd586d6 Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0 am: 6976661295
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886

Change-Id: I3d87afb4201315d3347fa0514f430948bafda32f
2021-06-16 10:31:53 +00:00
TreeHugger Robot
79e3d3c156 Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0 am: e0614a8c35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886

Change-Id: I9d3254a81dab1a5a77b9c26c0e9a825b78a756e3
2021-06-16 10:31:13 +00:00
TreeHugger Robot
e0614a8c35 Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886

Change-Id: Ideba77ce284efcd846339b0628af19a165b0a2b7
2021-06-16 10:14:46 +00:00
TreeHugger Robot
6976661295 Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886

Change-Id: I6b0d8fe110983769365aad5369173ff6e23bb02e
2021-06-16 10:14:03 +00:00
TreeHugger Robot
bcc49f1fe0 Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev 2021-06-16 10:06:12 +00:00
Alex Johnston
2934694c28 Merge "RequestManageCredentials foldable view" into sc-dev am: 71786f9775 am: 8c310ec84f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964381

Change-Id: I2a9931df2b3ce31e1e68bcccd296f15941c53114
2021-06-16 09:57:00 +00:00
Stanley Wang
c03d18336f Merge "Update the illustrations to Lottie format." into sc-dev am: 51308300ef am: cd70ac2a5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934762

Change-Id: I77154a4e8475cc06d2f06e80a170b251acea1c3e
2021-06-16 09:56:31 +00:00
Alex Johnston
762d6c4e0a Merge "RequestManageCredentials foldable view" into sc-dev am: 71786f9775 am: 96dfbcc3b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964381

Change-Id: I8dee17f181affa6454b75994398fe75bfc24c469
2021-06-16 09:56:14 +00:00
Stanley Wang
b603233c78 Merge "Update the illustrations to Lottie format." into sc-dev am: 51308300ef am: 5da70e5205
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934762

Change-Id: I8347504e29bec4191c44c5cd014d15c545794873
2021-06-16 09:55:38 +00:00
Alex Johnston
96dfbcc3b0 Merge "RequestManageCredentials foldable view" into sc-dev am: 71786f9775
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964381

Change-Id: Ib5f302ebc3c898085e429861fe81fbf41f81f9a8
2021-06-16 09:38:49 +00:00
Alex Johnston
8c310ec84f Merge "RequestManageCredentials foldable view" into sc-dev am: 71786f9775
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964381

Change-Id: Iedbfa501d797d059af8be72905889fd3aa7a12a9
2021-06-16 09:38:25 +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
menghanli
25ee0a7438 Fix "Left" & "Right" in the wrong sides for LTR language
Root cause: In the LTR language, the "Left" & "Right" options should be in the opposite sides -- currently "Left" is in the right side and "Right" is in the left side (Same as the English version) and should be changed.
Solution: Keep ltr layout direction.

Bug: 190354990
Test: Manual test
Change-Id: I47b71b3db7c834984202513e2cac6c4d787518dc
2021-06-16 09:38:17 +00:00
Stanley Wang
cd70ac2a5a 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: I1898a72f14b9b78381431c31363ba866fb8566d8
2021-06-16 09:38:11 +00:00
Alex Johnston
71786f9775 Merge "RequestManageCredentials foldable view" into sc-dev 2021-06-16 09:27:03 +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
84c48cec44 Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e am: 179a97663d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879

Change-Id: I1ee0ee27fa9ff4275953c9405facdd240d7cb2de
2021-06-16 09:10:07 +00:00
TreeHugger Robot
6e5400a39b Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e am: 9d47792db0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879

Change-Id: Icc34103b16345077cef323b4fdd14a749ffb4a56
2021-06-16 09:09:35 +00:00
TreeHugger Robot
9d47792db0 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: Idf4a96c0c47211b558546141c93c536f8a6398e1
2021-06-16 08:54:32 +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
5b600efa65 Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 am: a7d250d29b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

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

Change-Id: I25a6721bd1a1259811cde7f36e2d942490b228f8
2021-06-16 08:26:07 +00:00
Kevin Chyn
c2b86c10d5 Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 am: 663b21c48b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

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

Change-Id: Ibcc5da3d626a4b1209a741e3801bf0a9a4939b81
2021-06-16 08:25:41 +00:00
Bill Lin
5b702c70a2 Add One-handed mode entry point in a11y system controls
Integrate One-handed mode entry in AOSP Settings.
(Settings > A11y > System controls > One-handed mode)

The entry will show if vendor set below system property
  * Property : ro.support_one_handed_mode
Otherwise, the entry will be hidden.

Test: manual check Settings UI
      Settings > A11y > System controls > One-handed mode
Bug: 182144396
Change-Id: I699c576a87057274529ca46dee394c413a4cea2b
2021-06-16 16:18:58 +08:00
Kevin Chyn
663b21c48b 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: I1838009dedd2ac3f6c4511379754816b5eaecddc
2021-06-16 08:09:26 +00:00
Edgar Wang
221f0a023d 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: I40d45fcba54a2975c2165b8e568a5475932fe340
2021-06-16 08:09:18 +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
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
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