Ahaan Ugale
3879729cd1
Merge "OWNERS for autofill and assist settings." am: 7af352dc73
am: 6d5dc7b451
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1621607
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb4accc78e211a45df173186defaca5634aa1b29
2021-03-08 07:06:26 +00:00
Trevor Black
c6a359a2a5
Merge "Add Extra App Info into Settings App UI." into sc-dev
2021-03-08 07:04:42 +00:00
Weng Su
d3e90e92d4
Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev am: 5c82ddf075
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2179d2900be82ad280b0b881569d555a44564dd
2021-03-08 06:27:22 +00:00
Weng Su
5c82ddf075
Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev
2021-03-08 05:57:06 +00:00
Ahaan Ugale
1014194897
OWNERS for autofill and assist settings.
...
tests/unit/../autofill is empty here; new files are being added in the
internal repo.
Change-Id: Ia4aaa395b01147ee0597cca6075aae0121de7dd9
Test: n/a
2021-03-07 00:40:15 +00:00
Zoey Chen
290ee6aa36
Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev am: d841a36c6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660509
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc74834fa439257a2ff1c6e82d5c15cc3b777793
2021-03-05 15:04:33 +00:00
Zoey Chen
d841a36c6f
Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev
2021-03-05 14:43:52 +00:00
Wesley Wang
892cf9808e
Merge "Update Battery Settings main page (1/2)" into sc-dev am: 783f1b1b56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698745
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib43d0b03cf4f9618a45b154eea51d21c0de46227
2021-03-05 11:55:47 +00:00
Wesley Wang
783f1b1b56
Merge "Update Battery Settings main page (1/2)" into sc-dev
2021-03-05 11:23:39 +00:00
TreeHugger Robot
96324ec3a3
Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev am: 2aa8d2b437
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec5873050d56edd21763a467766a80e844ba7dfe
2021-03-05 10:15:32 +00:00
TreeHugger Robot
2aa8d2b437
Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev
2021-03-05 09:53:05 +00:00
Weng Su
edebd02b0a
[Provider Model] Add Wi-Fi toggle
...
- Network & internet Settings
- Remove “Show airplane mode networks"
- Internet Settings
- Add “Wi-Fi” switch preference
- Show “Find and connect to Wi-Fi networks” in summary
- Screenshot:
https://screenshot.googleplex.com/AnoXf4qDe2jPirP
Bug: 181858434
Test: manual test
atest -c NetworkDashboardFragmentTest \
WifiSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ic420ff40cfdfb3ae29ee6f754ce139cb54651bda
2021-03-05 16:32:06 +08:00
Jason Hsu
c022defb32
Merge changes I135e5218,I1efd9760,Ia3d03054,I1fbe3157,Ic206a940, ...
...
* changes:
Add seekBar properties 'tickMark' to LabeledSeekBarPreference
Add the preference controller to control accessibility button fade preference
Add the preference controller to control accessibility button preview preference
Add the preference controller to control accessibility button opacity preference
Add the preference controller to control accessibility button size preference
Add the preference controller to control accessibility button location preference
Setup basic layout and resources for the accessibility button settings page
2021-03-05 06:40:06 +00:00
Wesley.CW Wang
280e3639cd
Update Battery Settings main page (1/2)
...
- Rollback ag/13413813 to meet the design change
- Regrouping the index
Screenshots:
https://screenshot.googleplex.com/85aPq9ArJMWjJV2.png
https://screenshot.googleplex.com/8uiZ9KLKAHoJyrP.png
Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: Ic3c16d985b7c5e98e6d1bbe4481c48eadd3e4078
2021-03-05 06:03:42 +00:00
SongFerng Wang
cc1715e2c0
Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664
am: 29594edb70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8cde83c4699a3859c3a0748688ab0c0dc0fd5a04
2021-03-05 05:17:42 +00:00
Tom Hsu
3bc9bcdae2
Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769541
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I724225de0d877cf017b289b7a0b9198771b20ba9
2021-03-05 04:53:46 +00:00
TreeHugger Robot
ef509128d5
Merge changes from topic "jr_device" into sc-dev am: dd6255a653
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774765
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I89c3f66711f680ad87fdef74835df607410d2460
2021-03-05 04:50:43 +00:00
TreeHugger Robot
7e7779a422
Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev am: 74d540f8f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13755450
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85baaf7368b8f34046e606a451528fd3d3c416df
2021-03-05 04:25:01 +00:00
Tom Hsu
1db2d1a25b
Merge "[Provider Model] Fix preference summary not update." into sc-dev
2021-03-05 03:25:59 +00:00
Jeremy Goldman
576009adeb
Merge "StorageProfileFragmentTest converted to JUnit"
2021-03-05 03:24:17 +00:00
jasonwshsu
f9fdedaafe
Add the preference controller to control accessibility button fade preference
...
* Opacity preference will be disabled when fade is disabled
Bug: 173940869
Test: atest AccessibilityButtonFadePreferenceControllerTest AccessibilityButtonOactiyPreferenceControllerTest
Change-Id: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba
2021-03-05 10:27:39 +08:00
jasonwshsu
603014760f
Add the preference controller to control accessibility button preview preference
...
* Create FloatingMenuLayerDrawable class to handle the preview layer drawable
Bug: 173940869
Test: atest AccessibilityButtonPreviewPreferenceControllerTest FloatingMenuLayerDrawableTest
Change-Id: Ia3d030547b377e87c505b2310f559f7f3876ecd5
2021-03-05 10:27:34 +08:00
SongFerng Wang
6775f40664
Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason"
2021-03-05 01:59:53 +00:00
TreeHugger Robot
dd6255a653
Merge changes from topic "jr_device" into sc-dev
...
* changes:
Update NLS listing page
Add device list to NLS pages
Add icons to NLS mgmt page
2021-03-05 01:02:02 +00:00
Treehugger Robot
32d2075fa3
Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API."
2021-03-05 00:02:28 +00:00
TreeHugger Robot
74d540f8f0
Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev
2021-03-04 22:46:37 +00:00
Julia Reynolds
ddf1958bdc
Update NLS listing page
...
- Organized by allowed/not allowed
- Include paired devices if there are any
Test: settings robotests
Fixes: 181125174
Change-Id: Id64ee0ebd9b40a92d54a03d92fec3ff0bb3b926d
2021-03-04 20:54:10 +00:00
Yi Jiang
05a310b89b
Merge "Adds 'more details' hyper link." into sc-dev am: c08943784c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769106
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3da3a8ced8594349dd7e01063b0d2f3cae253883
2021-03-04 18:58:16 +00:00
Yi Jiang
c08943784c
Merge "Adds 'more details' hyper link." into sc-dev
2021-03-04 18:11:11 +00:00
Julia Reynolds
ef6646458b
Add device list to NLS pages
...
If a notification listener has access via the
companion device manager api, list the name(s) of the
associated devices to give the user more context about
why the app has notification listener access.
Test: settings unit
Bug: 181125174
Change-Id: I01771b2c4e136fe16d23e89f33f85f63803e3f7c
2021-03-04 15:31:35 +00:00
SongFerng Wang
1cb02f5e0d
Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b
am: d5ff766ed8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I298f46dd7e44e63141b91ccdd67ea7ebbefc9015
2021-03-04 13:45:19 +00:00
SongFerngWang
959454f32a
Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed
am: 18c15a2545
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2de84a9f2ee32569f71fd46fc87a448237147d02
2021-03-04 13:45:18 +00:00
tom hsu
edaeb41ff7
[Provider Model] Fix preference summary not update.
...
- When activity enter onPause, the status will not update, then
sub id of TelephonyManager keep same value after activity go back.
- Solution: Everytime update the UI, and always get new
TelephonyManager with the latest sub id.
Bug: 181196545
Test: atest passed.
Test: Manual test passed.
Change-Id: I1d65bbc06af66b97b6c85f40bed394da03213d06
2021-03-04 21:26:57 +08:00
SongFerngWang
fc435e3736
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
Merged-In: I2b981569ad11cf70a558c1952cc2e077464328d8
2021-03-04 19:20:04 +08:00
Weng Su
698b4b3ca0
[Provider Model] Ethernet default network with APM enabled on Panel
...
- Move the connected Wi-Fi network into Wi-Fi list
- Screenshot:
https://screenshot.googleplex.com/ALgpHTy8RWUYjSk
Bug: 178926547
Bug: 179106406
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: Idd0e0ab52d6fc88633d5b2eddabb00036e077c88
2021-03-04 18:27:54 +08:00
SongFerngWang
1ffba4af4e
[Testcase] To migration DisabledSubscriptionControllerTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment
to get context
3. Change Copy Right
4. remove the mock of PreferenceScreen
Bug: 173003522
Test: atest DisabledSubscriptionControllerTest.java
Change-Id: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
Merged-In: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
2021-03-04 09:41:56 +00:00
SongFerngWang
766f78e8ed
Use SubscriptionManager.getResourcesForSubId to get Resources
...
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.
Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest
Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
Merged-In: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
2021-03-04 09:41:31 +00:00
Yi Jiang
bc6ec17120
Adds 'more details' hyper link.
...
Adds a 'more details' hyper link in the footer when options are disabled
by admin.
Test: make ROBOTEST_FILTER=ScreenTimeoutSettingsTest RunSettingsRoboTests
Bug: 180314728
Change-Id: I880ccd73f4b2ef0b695619ef42ec87559dc2b65b
2021-03-04 01:19:50 -08:00
SongFerng Wang
a0a079ed11
Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102
am: fa58b7e292
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614988
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I68dd01db1ee41b4baf09338872edc8599d892f96
2021-03-04 07:41:45 +00:00
changbetty
44812e5f61
[Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0
am: d64a350d86
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7cde36e5bc7ca5b0899915eaaaf04c0dd974f22
2021-03-04 07:41:43 +00:00
changbetty
f0ea678e15
[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf
am: fec00ac4b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614986
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I280b6ed2f09e4c040c4563582cee05c3a03c66bc
2021-03-04 07:41:09 +00:00
Hugh Chen
50fc7d15ef
Fix "USB tethering" doesn't work after reconnecting USB
...
Before this CL, if users selects usb tethering option and
reconnects usb it would not start entitlement check.
Because we only start entitlement checks when users select it.
This CL will start entitlement checks when usb tethering option
is selected and reconnects usb.
Bug: 176037347
Test: make -j42 RunSettingsRoboTests
Change-Id: I3a2ad392a1cae9cf97355ef3cd4fb8c23de18673
2021-03-04 15:31:11 +08:00
changbetty
d64a350d86
[Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id43b7eb15d35bc2c3730b3118d399c8d4f66424f
2021-03-04 06:48:18 +00:00
changbetty
fec00ac4b7
[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614986
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d5ff0ee3f8af2de5387d61094be0d9f3c35ce6b
2021-03-04 06:48:02 +00:00
Janis Danisevskis
e92bcb3287
Keystore 2.0: Update Wifi settings to use mostly public keystore API.
...
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
2021-03-03 22:30:35 -08:00
SongFerng Wang
cbc2c4f102
Merge changes I89162011,I110727b6,I1778832b
...
* changes:
Settings JUnit test for PreferredNetworkModeContentObserverTest
[Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files
[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest
2021-03-04 06:17:31 +00:00
Jeremy Goldman
859fc2bc15
Merge "HardwareRevisionPreferenceControllerTest converted to JUnit."
2021-03-04 01:22:49 +00:00
Jeremy Goldman
7f98211d08
Merge "DeviceModelPreferenceControllerTest converted to JUnit."
2021-03-04 01:22:33 +00:00
Yu-Han Yang
ec189cc0da
Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev am: d0267d5f8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia69d0da674cd6e5ba2331cf6a593366747e5d4e4
2021-03-03 21:41:50 +00:00
Yu-Han Yang
d0267d5f8d
Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev
2021-03-03 20:45:29 +00:00