Commit Graph

996 Commits

Author SHA1 Message Date
Zoey Chen
4aef8765dc Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786

Change-Id: I1a63b9d82fd530af87c2c70ab21e24e599a967e2
2021-11-30 08:46:59 +00:00
Zoey Chen
8b1ecea060 [Settings] Should show carrier network if airplane mode is on
https://hsv.googleplex.com/6007361661566976

Test: atest SubscriptionsPreferenceControllerTest
Bug: 206990845
Change-Id: Id39b662f33b201a8e4ce53c34c3007eca9a40edf
2021-11-30 12:10:28 +08:00
Kevin Han
6dc2c76da0 Merge "Unhibernate an app when a user exempts it" into sc-v2-dev am: 83a8b76ec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16286576

Change-Id: Icacd93b1f5b0cfe950dd4e4ccc0f8081ad1d58c3
2021-11-18 21:58:23 +00:00
Kevin Han
83a8b76ec2 Merge "Unhibernate an app when a user exempts it" into sc-v2-dev 2021-11-18 21:37:46 +00:00
Zoey Chen
ca02377238 Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278

Change-Id: I40d08bd3d76425c504c2f17cf73a36e36d261615
2021-11-18 19:48:11 +00:00
Zoey Chen
c8ee867f2d Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev
* changes:
  [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3
  [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2
  [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI
2021-11-18 13:26:31 +00:00
TreeHugger Robot
2fc75eba80 Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888

Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
2021-11-18 03:41:27 +00:00
TreeHugger Robot
b84b7d586a Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev 2021-11-18 03:25:05 +00:00
Kevin Han
39f038137e Unhibernate an app when a user exempts it
When an app is exempted from hibernation, we unhibernate as well. This
prevents confusing situations where a user may return to the "Unused
Apps" page and sees that the app is still there even after exemption.

Bug: 205641871
Test: atest HibernationSwitchPreferenceControllerTest
Change-Id: I4f98a2212eefdb6c456a0de36d428021b262cca3
2021-11-17 22:38:45 +00:00
Zoey Chen
e714654c94 [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3
Test: atest DefaultSubscriptionControllerTest, NetworkProviderSettingsTest
Bug: 197066557
Change-Id: I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada
2021-11-17 13:09:48 +00:00
Zoey Chen
439bc7f9dd [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2
Test: atest CarrierWifiTogglePreferenceControllerTest
Bug: 197066557
Change-Id: I2f1d22fb77c4e56ed10e11dfe11e8b9e880f16ff
2021-11-17 10:37:41 +00:00
Zoey Chen
5515e9bde5 [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI
Test: atest NetworkProviderCallsSmsFragmentTest, SubscriptionsPreferenceControllerTest
Bug: 197066557
Change-Id: I55e0fa2ca7317cd8c9d1bce7c229b8344f43cc92
2021-11-17 10:37:20 +00:00
SongFerng Wang
9a7f3aaf0e Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279

Change-Id: I38ea72134e9f0bf453d6125763e4d6af6f323487
2021-11-17 06:55:17 +00:00
SongFerng Wang
f0a3348ceb Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev 2021-11-17 06:42:29 +00:00
Gary Jian
782506f61c Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269

Change-Id: I1de09d91f66438c4ac521ac7624eae41e9b54b34
2021-11-17 01:46:25 +00:00
Kevin Chyn
156db33a56 Disable combined controller only if all modalities require consent
Additionally, ensure that consent is only requested for modalities
that have not been previously consented to. We retrieve the consent
requirement (which come from DPM) in onActivityResult instead of
onCreate, since the signal may not be ready immediately.

Fixes: 196060286
Fixes: 204592495
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest

Change-Id: I984e61f28ffbf957c16cac4ea84f40b6ad7d8ae9
2021-11-16 12:32:56 -08:00
Gary Jian
68b861930a Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status
Bug: 205809218
Test: atest NrAdvancedCallingPreferenceControllerTest
Change-Id: I45ac1e95d669801c2d37f49943d7c16cfb7adae3
2021-11-16 04:40:08 +00:00
SongFerngWang
4d00bce2b2 Lost the registered cellinfo item after the aggregation
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I8a1af6eadd5852788a5455dd637e1c63316bb802
Merged-In: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:38:22 +08:00
TreeHugger Robot
d7bd386313 Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev am: 3b84fd462f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062214

Change-Id: Iec793d2d8f629bcb5d92cccf889e919db6450f54
2021-11-04 03:07:40 +00:00
TreeHugger Robot
3b84fd462f Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev 2021-11-04 02:51:01 +00:00
Jason Chiu
56dde819dc Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
2021-11-03 06:54:55 +00:00
Jason Chiu
9fc0f18181 Define a constant Sliceable#NO_RES for no resource cases
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
2021-11-03 12:23:49 +08:00
Jason Chiu
026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
594eb43159 Support slice deep links highlighting menu entries
- Add an interface to get highlight menu key resource in Sliceable
- Force implementing the new interface in TogglePreferenceController and
  CustomSliceable at syntax level
- Update the slice index db schema

Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: I0b5068bccd04f1590023de7f3385bc0a4c6fa47b
2021-11-01 14:27:34 +08:00
changbetty
5145c2db59 To use the getLaunchedFromPackage to get the actual package name
Bug: 170642995
Bug: 199176115
Test: Manual test
Test: atest -c RequestToggleWiFiActivityTest
Change-Id: I821e374d8762861f63185d20db2f75f05b503540
2021-10-15 08:00:40 +00:00
Jason Hsu
da247a3042 Merge "Support ability to add different page id for different accessibility service page in settings." into sc-v2-dev am: 768722fed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824482

Change-Id: I8d5053da73433f54491fe9e32f822757d09057ef
2021-09-23 07:12:16 +00:00
Jason Hsu
768722fed4 Merge "Support ability to add different page id for different accessibility service page in settings." into sc-v2-dev 2021-09-23 07:01:58 +00:00
Jason Hsu
9e787479a6 Merge "Add the AccessibilitySearchFeatureProvider mock in testutils/FakeFeatureFactory" into sc-v2-dev am: f7695aae33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15836289

Change-Id: I34e04b0e990cf4e0eb6e9729f99d545a4f421edf
2021-09-23 05:08:33 +00:00
Jason Hsu
f7695aae33 Merge "Add the AccessibilitySearchFeatureProvider mock in testutils/FakeFeatureFactory" into sc-v2-dev 2021-09-23 04:55:54 +00:00
jasonwshsu
3d0f12d043 Support ability to add different page id for different accessibility service page in settings.
Bug: 190344664
Test: build pass
Change-Id: I6cc90b27dcbb5075d13e3c59fe754309182b4d0a
2021-09-22 18:36:46 +08:00
jasonwshsu
01cc290446 Add the AccessibilitySearchFeatureProvider mock in testutils/FakeFeatureFactory
* Complete the missing part in ag/14299190

Bug: 184171842
Test: build pass
Change-Id: I020f218b58dca132bdb093163f764e125b8ea816
2021-09-22 18:36:17 +08:00
Zoey Chen
ab18c8ac04 Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev am: 39b6769e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834629

Change-Id: Iaa62b3be6f11eaa86b3d7b547f3e896e9bee5f9e
2021-09-22 06:06:57 +00:00
Zoey Chen
95db7ae728 [Provider Model] The SIMs page should list all p-SIMs
- We do not support multiple pSIMs until now, so we need to get all p-SIMs from SubscriptionManager
- Apply same checking for downloaded sim

Bug: 199032142
Test: vendor test
Test: atest NetworkProviderSimsCategoryControllerTest and atest NetworkProviderSimListControllerTest
Change-Id: I77d7c52e73ac4e5d09fa3f3926490d7f8f8b0913
2021-09-21 17:29:27 +00:00
Treehugger Robot
972166204d Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 am: 8a57649765
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I1845ebaf808192d3b28cc72f3548d0f489a4ce7c
2021-09-09 11:00:58 +00:00
Treehugger Robot
8a57649765 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: Iaf54828eaec9c24a83aaddec90d775dafab6dd34
2021-09-09 10:46:10 +00:00
Treehugger Robot
fbf2d0bc55 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I74de819b9c6eefb93d9447efe8398ddd27470933
2021-09-09 10:28:50 +00:00
pingzhi wang
860216208f Remove the option of resetting Euicc data.
Euicc reset option should not be available on devices that do not
support embedded sim cards.

Test: make SettingsUnitTests
Test: Build device without FEATURE_TELEPHONY_EUICC and check in Settings/System/Reset options
Bug: 197280361
Change-Id: I24cc65fbe0f8e3c4f1cf792a7b8c5dbfc49d469b
2021-09-08 17:34:30 +02:00
SongFerng Wang
5bcabf3a78 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I5b5d99714ac24977c7a74926ae859bdb0bc0e94e
2021-09-08 03:51:39 +00:00
SongFerng Wang
9354a7e81c Merge "[VoNR] VoNR settings" into sc-qpr1-dev 2021-09-08 03:38:02 +00:00
SongFerngWang
eaa71ac6de [VoNR] VoNR settings
Allow user to enable or disable voice over NR.

Bug: 191203577
Test: atest
com.android.settings.network.telephony.NrAdvancedCallingPreferenceControllerTest

Change-Id: I9be4716d0cdac5d698c2058be65bfa541495d012
2021-09-07 10:57:34 +08:00
Zoey Chen
2d827ddf50 Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801

Change-Id: Ie210682def804b99f21e3803d95c4d14828af77c
2021-09-01 04:12:08 +00:00
Zoey Chen
f25a00217c Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev 2021-09-01 03:58:13 +00:00
Joe Bolinger
95626d62f3 Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9 am: 46470d911e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: Idaec22cc49b17bc088380ec4da7ce51e2f037856
2021-09-01 01:43:26 +00:00
Joe Bolinger
bc188f609c Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: Ifd9ebd5877ce8020c0c977db8f6744c03ca24c70
2021-09-01 01:26:40 +00:00
Joe Bolinger
46470d911e Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: I8423ebeee18eb6e9213a2e45bc5f2eed3a19aabd
2021-09-01 01:25:27 +00:00
Zoey Chen
35803a3b03 [Provider Model] Add a cutout for signal icon if the mobilde data is disabled
Screenshot: https://screenshot.googleplex.com/57wPkj9pq9hP5WA.png

Bug: 198233143
Test: manual, atest SubscriptionsPreferenceControllerTest
Change-Id: I3caefc7e1ca10dadcad114273edf35d9309502e1
2021-08-31 16:03:23 +00:00
Zoey Chen
5c49db8d8b Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15544646

Change-Id: Iaae85f03949e22b76390956de127513c2b806863
2021-08-25 04:54:20 +00:00
Zoey Chen
538af552c0 Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev 2021-08-25 04:29:12 +00:00
Joe Bolinger
f78cec292c Remove sliceable attribute from biometric preference controllers.
This removes the top-level UI switch on some of the boolean preference settings.

Bug: 193438173
Test: atest com.android.settings.biometrics
Change-Id: If1cd2cb9ae456021fcdf0efc5002db4a083b9689
2021-08-20 18:42:50 +00:00
Xin Li
7d646a5182 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:14 +00:00