Bonian Chen
69b052a2e3
Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb
am: 49e4eb1151
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791
Change-Id: I2b8370c7b7bab117251269df256eee966153f42d
2021-06-25 02:27:38 +00:00
Bonian Chen
f9aa12f4d9
Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev
2021-06-25 02:17:59 +00:00
Bonian Chen
7b8e05adab
Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"
...
This reverts commit 2a1344a50e
.
Reason for revert: Missing some files which would lead to build breakage.
Change-Id: I8c63dea9b41598b563cbf5e5ff1c500cc51b7005
2021-06-25 02:10:43 +00:00
Bonian Chen
97886470cb
Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev
2021-06-25 01:59:05 +00:00
Jeremy Goldman
74597578ca
LegacyVpnPreferenceTest added for Vpn settings
...
Ensure that the profile name is successfully stored, and that the title
of the preference corresponds to the name of the associated VpnProfile
Interesting issue occurred where the icon resource was not present the
first time the class was initialized, but not the second. Trying this
twice within the test resolved this issue.
Test: atest -c LegacyVpnPreferenceTest
Bug: 187245804
Change-Id: I325b155cb0afdb6ce134325944fe5651bf9a1233
2021-06-25 09:21:03 +08:00
TreeHugger Robot
8f11a6799f
Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a
am: 4cbdf9d17a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801
Change-Id: I20c21a9f47793f371c23cd76dbe8402e8e5ac4f5
2021-06-23 16:03:44 +00:00
Weng Su
9395d39063
[Provider Model] Remove Wi-Fi switch menu in internet panel
...
- Remove "Turn on/off Wi-Fi" menu in internet panel
- Don't show the default "See more" menu in internet panel also.
Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest
Change-Id: I3a9927e356e0f7e534b1e2ba848d2b6d2a5bd858
2021-06-23 12:47:06 +00:00
TreeHugger Robot
37fada87a3
Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472
am: bffc06f40d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792
Change-Id: I8d7e2612ce6f82917f0005c62e1e8de6a96550d2
2021-06-23 10:47:44 +00:00
TreeHugger Robot
33b8710479
Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81
am: c4501805c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930
Change-Id: I0f21062b2df8ea153601bba68338dbf5459b03e8
2021-06-23 10:47:39 +00:00
TreeHugger Robot
b86f0c0472
Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev
2021-06-23 10:19:04 +00:00
TreeHugger Robot
d26416ce81
Merge "[Provider Model] Show carrier network to internet preference" into sc-dev
2021-06-23 10:11:33 +00:00
Weng Su
362bf07919
[Provider Model] Add Wi-Fi toggle in internet panel
...
- Add a new slice row for Wi-Fi toggle in the network lists
- Increase the maximum number of network lists to 6
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: Ie25e108573f264ab3a94fc6804b9d46d855eeea1
2021-06-23 17:19:34 +08:00
Weng Su
627efc46a2
[Provider Model] Show carrier network to internet preference
...
- If the connected network is the merged carrier Wi-Fi, then show
carrier network to internet prefernce.
Bug: 191091045
Test: manual test
atest -c InternetUpdaterTest
Change-Id: Iad3869f086ea0a4d0607691c6709ee12567831c7
2021-06-23 15:55:24 +08:00
Bonian Chen
2a1344a50e
[Settings] Code Refactor - ActiveSubsciptionsListener
...
Fix the spelling with "ActiveSubsciptionsListener" into "ActiveSubscriptionsListener".
Bug: 191321218
Test: build pass
Change-Id: I7282c7ba9fbb793056c12928843b6eef59eb2213
2021-06-23 07:34:00 +00:00
TreeHugger Robot
ae2793958d
Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
am: ed23563724
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681
Change-Id: I28e9ef93d74c6063545fac0b6be940f4991d61e8
2021-06-22 13:05:19 +00:00
TreeHugger Robot
dbd5c9cc7c
Merge "Rollback the See More Intent for non-provider model design" into sc-dev
2021-06-22 12:39:05 +00:00
Weng Su
4f1ebfdc55
Rollback the See More Intent for non-provider model design
...
Bug: 191055897
Test: manual test
atest -c InternetConnectivityPanelTest
atest \
CtsProviderTestCases:android.provider.cts.SettingsPanelTest#internetPanel_seeMoreButton_launchesIntoSettings -- --abi arm64-v8a
Change-Id: Iad57dd6a9cdbc4b33f80255bdb4758f80f9f2151
2021-06-22 09:31:32 +00:00
Jason Hsu
1ddbf04f88
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4
am: 82531a695b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190
Change-Id: Id4fb63ef6a5bd335fe52cb8c3fd4e7d776045f34
2021-06-21 14:02:21 +00:00
jasonwshsu
87b90dfc50
Improve search by adding the settings keywords for supported downloaded services
...
* Use FeatureFactory to improve the search only for google overlay
Bug: 184171842
Test: atest AccessibilitySettingsTest
Change-Id: I93ed52d2579b7da35dba59f9562b6715d13dd80d
2021-06-21 16:03:37 +08:00
Joe Bolinger
483b89c575
Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d
am: 30c3003696
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492
Change-Id: If760363bf2408e2a8aceb6183242c14386f98e65
2021-06-18 17:03:47 +00:00
Joe Bolinger
0fcac8bf0d
Merge changes from topic "unicorn-1" into sc-dev
...
* changes:
Update strings for parental consent flow in setup wizard.
Add plumbing and placeholder screens for parental consent flow.
2021-06-18 16:28:27 +00:00
SongFerng Wang
90602b73d1
Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0
am: efcce7f70f
am: 001395533a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650
Change-Id: I698df31c58cf3e545b53a48da5225dd2bc703925
2021-06-18 09:59:07 +00:00
SongFerng Wang
7e4b664df0
Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev
2021-06-18 09:38:18 +00:00
SongFerngWang
c9a9faf5b8
Add the confirmation dialog when user disable mobile data at first time
...
Bug: 189983549
Test: atest ProviderModelSliceTest
Change-Id: I83fcadb07e4f8dff5d07bc4015c0c6004c4f5de5
2021-06-18 15:58:58 +08:00
Sally Yuen
7e9dd59211
Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9
am: a1c3689199
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080
Change-Id: Id25a4844c64f348127c7c92bcef3e8a82477c8bb
2021-06-17 16:06:13 +00:00
Sally Yuen
afd77763b9
Merge "Add labels to intensity slider and flip labels" into sc-dev
2021-06-17 15:37:32 +00:00
Bonian Chen
7656542419
[Settings] Code Refactor - ActiveSubsciptionsListener
...
Fix the spelling with "ActiveSubsciptionsListener" into "ActiveSubscriptionsListener".
Bug: 191321218
Test: build pass
Change-Id: I7282c7ba9fbb793056c12928843b6eef59eb2213
2021-06-17 12:00:53 +08: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
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
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
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
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
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
24b81dcffb
Merge "Convert biometrics to RestrictedPreference" into sc-dev
2021-06-16 06:13:04 +00: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
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
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
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
a8fcc6a678
Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066
am: 91d1b6640a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828
Change-Id: Ic3e3f1c1364e529c57a01d332e2244d0615ec566
2021-06-15 13:01:36 +00:00
TreeHugger Robot
ab04f86066
Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev
2021-06-15 12:36:38 +00:00
TreeHugger Robot
ac44f3569a
Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e
am: 479c1a1c5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760
Change-Id: I7f9cf20b6aab539555df3e9644f2d499252f3467
2021-06-15 09:48:18 +00:00
Weng Su
58a651566f
[Provider Model] Remove Wi-Fi disconnect action
...
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: I964bf8de4f5eee1523943876567bf565ccb7f995
2021-06-15 17:43:31 +08:00
TreeHugger Robot
1ce0d1117e
Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev
2021-06-15 09:23:58 +00:00
TreeHugger Robot
bc895fd254
Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2
am: d441988494
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819
Change-Id: I7bd0881b5314b0a7a82da64875aab5a990382871
2021-06-15 08:25:25 +00:00
TreeHugger Robot
68079c7bd2
Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev
2021-06-15 07:59:57 +00:00
Weng Su
28e5f4c2fc
Revert "[Provider Model] Add WiFi toggle in internet panel"
...
This reverts commit 04a4060225
.
Reason for revert: Need to split the functions for cherry picking to different branches
Bug: 189912933
Change-Id: I8c30a87c83e23b3df88ce2689d500626e1dd28d2
2021-06-15 04:10:13 +00:00
Jason Chang
3ab0d7b1b9
Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1
am: 7e61c806e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130
Change-Id: I0ba93c73c85b9c8120ed23fa3642921fe73fe87f
2021-06-12 12:06:55 +00:00
Jason Chang
5213fbced1
Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev
...
* changes:
Update key visual changes for one handed mode settings
Remove redundant swipe down notification and one handed sub settings
2021-06-12 11:49:16 +00:00
TreeHugger Robot
5b4f9e63dc
Merge "[Provider Model] Add WiFi toggle in internet panel" into sc-dev am: 38df9ce8bb
am: 2ba6886bce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880638
Change-Id: I577afae3fa5b5c952a265951f66fccb183d45fcc
2021-06-12 11:07:24 +00:00
Weng Su
c4eb3b1320
[Provider Model] Hide W+ network if it's inactive
...
Bug: 187854575
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
SubscriptionsPreferenceControllerTest
Change-Id: Ib99bc7fef38a99c1da1e365c2002ad30c617d445
2021-06-12 00:55:10 +00:00