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
tim peng
cd4df5a1d3
Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev am: d082221652
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241059
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia9a1679a3b154e0aba27a01d1ad42f407e3d58a4
2021-03-05 04:25:29 +00:00
Zoey Chen
bf1857e4a5
[Telephony] Use TelephonyCallback instead of PhoneStateListener part5
...
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*
Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
Merged-In: I52af54045872bbf13e64d5d94c8b027ec702abb9
2021-03-05 11:46:46 +08:00
Tom Hsu
1db2d1a25b
Merge "[Provider Model] Fix preference summary not update." into sc-dev
2021-03-05 03:25:59 +00:00
Janis Danisevskis
3c7b085331
Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0"
2021-03-05 02:57:34 +00:00
Abel Tesfaye
61aa289dac
Merge "Instrument metrics for smart-auto-rotate and screen timeout" into sc-dev
2021-03-05 02:39:02 +00:00
tim peng
d082221652
Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev
2021-03-05 02:03:05 +00:00
SongFerng Wang
6775f40664
Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason"
2021-03-05 01:59:53 +00:00
Yomna Nasser
6adc5ab334
Add metrics to Enable2gPreferenceController.
...
Test: m & atest -c Enable2gPreferenceControllerTest & statsd_testdrive 97
Bug: b/181699391
Change-Id: I1ad860937cec7594c482706cadd853b115436594
2021-03-05 01:18:40 +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
Abel Tesfaye
029c095720
Fix long press auto rotate implementation bug
...
Test: locally with flame
Bug: 181741815
Change-Id: I8090471f8c6dbd8e6e4edb4f838779c901c4791b
2021-03-04 23:01:51 +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
Abel Tesfaye
9481334a6a
Instrument metrics for smart-auto-rotate and screen timeout
...
Test: locally with flame
Bug: 172974834
Change-Id: Id6927e749049c88e4efea2d69f93b9d397acc1c1
2021-03-04 20:01:36 +00:00
Jimmy Chen
e82e80450c
wifi: add WPA3 Enterprise entry in "Add network"
...
Bug: 174569407
Test: checked UI manually and stored configurations.
Change-Id: I8a05bbb11e4a363c39a71d26513caf727d228b36
2021-03-05 03:06:17 +08: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
Stanley Wang
a380b04d7b
Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev
2021-03-04 14:12:47 +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
Victoria Lestari
765edb60a3
VoiceInputHelper should not show recognition service if it's not selectable as default
...
Bug: 175429607
Change-Id: I47413e620ed65cf5556a9083bec1e1b2407f4783
2021-03-04 13:29:13 +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
Stanley Wang
c4d839e3df
Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev
2021-03-04 11:44:38 +00:00
Calvin Pan
41a7293038
Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev
2021-03-04 11:33:47 +00: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
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
Stanley Wang
b69896ae60
Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM"
...
notification will pop up.
The root cause of the problem is that the switch preference and
switch bar status are not sync when using setCheckedInternal API.
Fix: 179498532
Test: Run robotest and see the ui
Change-Id: Ib51dc2ef27ce49b9c8ba69eb32757bf6b9945baf
2021-03-04 15:50:47 +08: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
Stanley Wang
3b70c6c41a
Fix the overlap issue of MainSwitch and list view.
...
This issue happen on Developer and Wi-Fi pages, so the problem
should be solved on SettingsActivity.
Fix: 181341927
Test: Run robotest and see the ui
Change-Id: I57722cfcbeb6390c88101d808429346045e57c92
2021-03-04 15:08:18 +08:00
Janis Danisevskis
146a0dab01
Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0
...
Keystore 2.0 no longer stores vpn profiles. It still offers a
Legacy VPN profile store, to access existing profiles.
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
Change-Id: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
2021-03-03 22:30:48 -08: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
Janis Danisevskis
f33b7dd3cc
Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into rvc-qpr-dev-plus-aosp
2021-03-04 05:33:21 +00:00
Janis Danisevskis
1a10ffe990
Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev
2021-03-03 22:28:41 +00:00
Xin Li
6b94f5ac81
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:36 +00:00
Yu-Han Yang
d0267d5f8d
Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev
2021-03-03 20:45:29 +00:00
Trevor David Black
d0d796c90b
Add Extra App Info into Settings App UI.
...
Bug: b/174956516
Test: Settings -> Apps -> APP -> Extra App Info
Change-Id: Id978fb3569579f54b8399156d52c2ddeceb9bb91
2021-03-03 19:52:15 +00:00
Xin Li
2aa4fea82d
Merge RQ2A.210305.007
...
Bug: 180401296
Merged-In: I12e20519ac29f802f9983dcf27f313388b33829c
Change-Id: I8ca0bb7173f6abe08596422b281f6913b66ab9b7
2021-03-03 09:12:21 -08:00
Adrian Roos
d99faa25c0
Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
am: ddf3efb070
am: 8c38e9543e"
...
This reverts commit 0df55e1eb4
.
Reason for revert: Other CLs in topic were skipped, but this one wasn't, which broke sc-dev.
Change-Id: Icf61dae071416381ea11cbe74cd92ae934c3047e
2021-03-03 14:51:42 +00:00
Paul Hu
0df55e1eb4
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
am: ddf3efb070
am: 8c38e9543e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4332292590088a0453cd7cfa2dc66f775e2d79dd
2021-03-03 13:27:16 +00:00
TreeHugger Robot
42ac293a53
Merge "Return RESULT_OK RequestManageCredentials" into sc-dev
2021-03-03 12:43:13 +00:00
TreeHugger Robot
decaeda453
Merge "Refactor Usb settings" into sc-dev
2021-03-03 12:12:24 +00:00
Alex Johnston
c82767f627
Return RESULT_OK RequestManageCredentials
...
Bug: 177979648
Test: Manual testing
Change-Id: I3b4968131f8c7b811752704808d0ef4df617a658
2021-03-03 11:30:46 +00:00
Hugh Chen
0091ae6142
Refactor Usb settings
...
1. Rename ShouldIgnoreClickEvent() to isClickEventIgnored().
2. Use TetheringManager instead of ConnectivityManager.
Bug: 175651578
Test: make -j42 RunSettingsRoboTests
Change-Id: I37c49694257b7575550b5a905e293b5d056ba1bf
2021-03-03 18:13:17 +08:00
Zoey Chen
ea29704e40
[Telephony] Use TelephonyCallback instead of PhoneStateListener part5
...
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*
Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
2021-03-03 16:23:52 +08:00
Paul Hu
8c38e9543e
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
am: ddf3efb070
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iccd3b694b9e9f4ac1658093923c923a98d83ccfb
2021-03-03 08:07:19 +00:00
Sally Yuen
aaff760df0
Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev
2021-03-03 03:03:35 +00:00
Paul Hu
ddf3efb070
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51b526d575a540cfb7ab6cef8be5d096f3660728
2021-03-03 02:59:37 +00:00
Minche Li
ecf1c07e63
Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev
2021-03-03 02:24:09 +00:00