Commit Graph

35178 Commits

Author SHA1 Message Date
Calvin Pan
e0ee1e1d74 Merge changes Icee8c85e,I98be6f30,I343b705b
* changes:
  [Smart forwarding] Enable/Disable Smart Forwarding flow
  [Smart forwarding] Add UI for Smart Forwarding
  [Smart forwarding] Add string and layout resource
2021-01-25 07:29:45 +00:00
Arc Wang
c6ee2244a7 Merge "Fix battery optimization display problems" 2021-01-25 03:12:11 +00:00
calvinpan
71dd99c767 [Smart forwarding] Enable/Disable Smart Forwarding flow
Bug: 170178144
Test: By manual
1. Test turn on/turn off flow
2. Test enter phone number flow

Change-Id: Icee8c85e71f72f467b2dc11b9b55c674f22d8179
2021-01-25 10:08:33 +08:00
calvinpan
6c21dd470d [Smart forwarding] Add UI for Smart Forwarding
Bug: 170178144
Test: By manual
1. Test turn on/turn off flow
2. Test enter phone number flow

Change-Id: I98be6f307f78b61020a15f72a3d4bf04089ead66
2021-01-25 10:08:02 +08:00
SongFerng Wang
11501a0bc2 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" 2021-01-23 07:41:11 +00:00
Felipe Leme
3158f45161 Merge "Refactored Settings calls to removeUserOrSetEphemeral()." 2021-01-22 16:31:09 +00:00
Weng Su
bfefb8015a Merge "[Provider Model] Update internet preference icon and summary" 2021-01-22 05:34:14 +00:00
Sarah Chin
5a8b96a2af Merge "Update onSubscriptonOverride listener" 2021-01-21 18:28:19 +00:00
Weng Su
46837dc4d5 [Provider Model] Update internet preference icon and summary
- Airplane mode icon/summary

- Airplane mode networks icon/summary

- Wi-Fi network connected icon/SSID

- Cellular network connected icon/carrier-name

- Ethernet network connected icon/summary

- Screenshot:
  https://screenshot.googleplex.com/AzhCEX2HjwYUMtJ
  https://screenshot.googleplex.com/9BRfQLMW4UvHqqq
  https://screenshot.googleplex.com/5jdi8oEjMPUURdT

Bug: 176796623
Test: manual test
- atest -c InternetUpdaterTest \
           InternetPreferenceControllerTest

Change-Id: Icc8944dabdac597f12b67cffa72cb0be02d9671d
2021-01-21 17:24:10 +08:00
TreeHugger Robot
9c4e419b61 Merge "Default emergency gesture setting On." 2021-01-21 02:49:25 +00:00
TreeHugger Robot
f6390d7924 Merge "Revert "Workaround Wi-Fi Settings NullPointerException"" 2021-01-21 02:44:15 +00:00
Fan Zhang
e81091175e Default emergency gesture setting On.
And a few drive-by fixes:
* Move all emergency gesture fragments and controllers to emergency
  package for better code colocation.
* Remove the placeholder video preference from emergency_gesture_settings.xml

Bug: 178009196
Test: reran robotests
Change-Id: Ifcb591e7ab8e5e5494c480cbbe9410c08c296f8e
2021-01-20 13:08:04 -08:00
Manish Singh
1c1329948f Switch the default option from B to A
The switch implies that we will not transcode by default.

Test: manual
BUG=177931834

Change-Id: I6daee5bdf0f77ef65eda2db6be055fad0bceded3
2021-01-20 19:37:28 +00:00
TreeHugger Robot
a347993239 Merge "Add metrics for EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY" 2021-01-20 18:05:49 +00:00
Yanting Yang
47e0556e98 Revert "Workaround Wi-Fi Settings NullPointerException"
This reverts commit 99eb12048c.

Reason for revert: Revert this workaround since the real solution has been submitted and released. More information please see b/177766209.

Change-Id: I566194ff71bb9e912407d6d4b3798adc6be71779
2021-01-20 16:41:36 +00:00
Alex Johnston
8403e31d82 Merge "Fix CredentialManagementAppControllerTest" 2021-01-20 15:24:14 +00:00
TreeHugger Robot
f4e71b0019 Merge "Support EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY" 2021-01-20 14:40:25 +00:00
Alex Johnston
8fc55e0231 Fix CredentialManagementAppControllerTest
Bug: 175277372
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CredentialManagementAppControllerTest
Change-Id: I5f9177d19232f38a761df9adba94d080464120e2
2021-01-20 11:29:07 +00:00
Rubin Xu
bc5da644dd Add metrics for EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY
Bug: 169832516
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Change-Id: I2bcd6c4f1a5f04582bb88ec9fb285621b9ec77eb
2021-01-20 11:17:13 +00:00
Rubin Xu
ff1b547548 Support EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY
When set, only enforce password requirement explicitly set device-wide.

As part of the change, restructure the code such that ChooseLockGeneric
becomes the central place for aggregating password requirements from
different parties, while ChooseLockPassword only enforces whatever
password reuirement it is told (by ChooseLockGeneric via intent extras)

Bug: 169832516
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password

Change-Id: I0acbea4819c13d4a8444c7b06928baccead18837
2021-01-20 11:16:22 +00:00
Ben Chung
1c7eba6660 Merge "Add audio adjustment fragment in a11y settings" 2021-01-20 08:49:35 +00:00
SongFerngWang
60c4163244 Replace allowedNetworkTypes with allowedNetworkTypesForReason
- Replace getAllowedNetworkTypes with
getallowedNetworkTypesForReason(ALLOWED_NETWORK_TYPES_REASON_CARRIER)
- Replace "Settings.Global.PREFERRED_NETWORK_MODE" with
"getAllowedNetworkTypesForReason(USER)"
- Move EnabledNetworkModePreferenceControllerTest from robotests to unit
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT
- Rename PreferredNetworkModeContentObserver to AllowedNetworkTypesListener
Bug: 161434786
Test: build pass.
(PASS)atest CdmaSystemSelectPreferenceControllerTest
(PASS)atest PreferredNetworkModePreferenceControllerTest
(PASS)atest AllowedNetworkTypesListenerTest
(PASS)atest EnabledNetworkModePreferenceControllerTest
(PASS)atest MobileNetworkUtilsTest

Change-Id: I2b981569ad11cf70a558c1952cc2e077464328d8
2021-01-20 08:23:08 +00:00
Jeremy Goldman
1f09c95571 Merge "Helper function to return the unique name for subscription info" 2021-01-20 00:14:41 +00:00
TreeHugger Robot
844bfb3683 Merge "Fix null handling" 2021-01-19 21:14:40 +00:00
Abel Tesfaye
fc2582c0ea Merge "Correct Wifi Share UI margins and capitalization" 2021-01-19 20:00:49 +00:00
Julia Reynolds
833514376e Fix null handling
Test: cts verifier, notification listener
Fixes: 177202279
Change-Id: Ib25915b0b5a60e9c39986d3ba3af3073e9d2b822
2021-01-19 14:48:52 -05:00
TreeHugger Robot
544310993e Merge "Update FingerprintEnrollFindSensor for UDFPS" 2021-01-19 17:51:32 +00:00
Mill Chen
057ce4055e Update FingerprintEnrollFindSensor for UDFPS
Since the education page of UDFPS is different from the one for rear
fingerprint, it's necessary to create a new education page for UDFPS and
update the decription.

Bug: 177026524
Test: visual verified
Change-Id: I70eb80484cccfbb583c32dbaadbc6c2744b5db60
2021-01-20 00:01:35 +08:00
Jeremy Goldman
67c75ac102 Helper function to return the unique name for subscription info
Many classes within Settings have access to the subscription info, rather
than only having access to the subscription id. For these classes, it is
more convenient to have a helper method where the whole subscription
info can be passed in, rather than having to call the
getSubscriptionId() helper method in so many locations within the
telephony settings codebase.

Bug: 150370656
Bug: 148303118
Test: atest -c SubscriptionUtilTest
Change-Id: I181960933ab8610d5572b7a7d6671fab8c1dbd22
2021-01-19 09:30:14 +00:00
TreeHugger Robot
119bbbd308 Merge "[Provider Model] Add Fix connectivity toggle to Internet Settings" 2021-01-19 07:28:18 +00:00
Weng Su
598934d645 [Provider Model] Add Fix connectivity toggle to Internet Settings
- Add Fix connectivity toggle in menu item

- Show "Resetting your internet..." when recovering

- Screenshot:
  https://screenshot.googleplex.com/BPyRADfNUoPE8Dc

Bug: 172297799
Test: manual test
- make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I27594d24659ca281e224f86accc20d49514d5001
2021-01-19 06:08:53 +00:00
SongFerng Wang
8ee28c1baa Merge changes I79b4c3d4,Icc8a7793
* changes:
  [Provider mode] Carrier item display network type on slice.
  The provider model slice carrier toggle is broke.
2021-01-19 05:55:17 +00:00
SongFerngWang
c14eefb125 [Provider mode] Carrier item display network type on slice.
Bug: 176871752
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: I79b4c3d45a52f0be0c058044f1d79a7056386193
2021-01-19 12:23:22 +08:00
SongFerngWang
f3b25cc7cb The provider model slice carrier toggle is broke.
The slice doesn't upload subId for TelephonyManager and
the listeners.

Bug: 177385874
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: Icc8a7793204de2e2eadd0454edf50e466821b8f9
2021-01-19 11:58:58 +08:00
Bonian Chen
23ee815ef5 Merge "[Settings] Remaining part of Cross SIM calling (backup calling)" 2021-01-18 14:13:14 +00:00
Bonian Chen
26552500f6 [Settings] Remaining part of Cross SIM calling (backup calling)
1. Change the wording
2. Add a list of summary within Calls and SMSs UI

Bug: 174012397
Test: manual
Change-Id: I6dde0cea9c1386029377b3ea2682ed8b977f9427
2021-01-18 20:41:39 +08:00
Weng Su
1ab70837d2 Merge "[Provider Model] Connect carrier network issue fix" 2021-01-18 12:09:47 +00:00
TreeHugger Robot
c415e0d9cc Merge "Workaround Wi-Fi Settings NullPointerException" 2021-01-18 10:07:48 +00:00
Bonian Chen
7c22644825 Merge "[Settings] Initial config UI support for cross sim calling" 2021-01-18 09:49:04 +00:00
Weng Su
99eb12048c Workaround Wi-Fi Settings NullPointerException
- Add null pointer checking to avoid unexpected crash.

Bug: 177782266
Test: manual test
Change-Id: I2d9ce1777adbc80bb6c40b7bb830de12bb0a9748
2021-01-18 08:54:23 +00:00
Weng Su
99dbb43f0c [Provider Model] Connect carrier network issue fix
- Need to check if the data is enabled on the second SIM in the case of
dual SIM.

Bug: 177411771
Test: manual test
Change-Id: Ieead7a4550628d5380b8d0150cfd7a67c47980ca
2021-01-18 07:59:50 +00:00
Bonian Chen
5e12677d00 [Settings] Initial config UI support for cross sim calling
This is the initial configuration UI support for cross SIM calling.

Mock UI: https://docs.google.com/presentation/d/1u9eO9Fs2_kr1mqkzyVe-_iNldM6OBv4ucmhUTr3Z-0w/edit?resourcekey=0-siV3RVBkI_fjH8mMWHbtHg#slide=id.gb4a3581a82_0_0
Screenshot: https://screenshot.googleplex.com/3QX3Y6vAhBYv7LC

Bug: 174012397
Test: manual
Change-Id: Id96b72054bee9b3359e5336cc90acbff7e6d78ea
2021-01-18 15:36:27 +08:00
TreeHugger Robot
535da9c98d Merge "Revert^2 "Expose role API for Settings on RoleManager."" 2021-01-16 00:20:00 +00:00
Abel Tesfaye
cb03fb955f Correct Wifi Share UI margins and capitalization
Test: locally with crosshatch

Bug: 176926579
Change-Id: Ida59174f93ae696e4f2a91c353cf9b1649f1faac
2021-01-15 20:15:45 +00:00
Tom Hsu
7c8e8eb6c2 Merge "[Provider mode] Display network type on mobile data preference." 2021-01-15 19:47:17 +00:00
tom hsu
b392d43fff [Provider mode] Display network type on mobile data preference.
Connect to 5G mobile network
  - https://screenshot.googleplex.com/8RziSbSjstMaFiK
 Connect to Wi-Fi
  - https://screenshot.googleplex.com/6ND3DFFsnLKSQRd

Bug: 176141828
Test: Manual test passed.
Test: Atest passed

Change-Id: I69b8ce0c1f5a16f0ff492be0b4ab26166a51bdc3
2021-01-16 01:56:39 +08:00
TreeHugger Robot
65251cb82b Merge "Refine behaviors of new app page" 2021-01-15 16:33:51 +00:00
Yanting Yang
45b8181f46 Refine behaviors of new app page
- Make the new app page unsearchable when the silky home is disable.
- Add Special app access back since the move action is not confirmed.
- Update preference keys to fix the search conflict with old app page.

Bug: 174964405
Test: robotest & visual on Settings Search
Change-Id: If92b084170ef0694d034ddde786f333b4b576572
2021-01-15 22:42:37 +08:00
TreeHugger Robot
6b1e7c616d Merge "Remove both help and search icons from toolbar of wifi calling" 2021-01-15 12:43:21 +00:00
Mill Chen
b126caa0e7 Remove both help and search icons from toolbar of wifi calling
On Android S, both help and search icons will be removed from each
toolbar of subsetting page. Using a feature flage to turn on/off these
menu items. After the collaping toolbar feature rolled out, the option
menu of toolbar will be removed entirely.

Bug: 177640645
Test: visual verified
Change-Id: I005fe85f23f8d28b3a6ca273ddb86ad3390ee0da
2021-01-15 19:01:03 +08:00