Weng Su
2a0cad3a2a
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1acaa4a03d9f40baa0a8382e40d31c00b5154465
2021-03-05 04:30:04 +00:00
Treehugger Robot
c4f1bd9675
Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0873d00dc15ffae3ac08ada37986a724bf825780
2021-03-05 04:26:16 +00:00
TreeHugger Robot
0d290a85c7
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432624
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I052bc73db19c56eff3cfa7dec4453595c4fe29d3
2021-03-05 04:26:00 +00:00
Weng Su
c271a656a7
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours am: 739bf235e5 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6e308309d136e18ecfe56f17e4379504197676c
2021-03-05 04:25:55 +00:00
Weng Su
739bf235e5
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie75ab656ae36f2960b84784c48c82ae640e933a6
2021-03-05 04:25:30 +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
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
Weng Su
9da6b6f4ae
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448945
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I120f48d18c1591b5d1e1b1182e4ce06d9babbb7a
2021-03-05 04:24:50 +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
Jeremy Goldman
576009adeb
Merge "StorageProfileFragmentTest converted to JUnit"
2021-03-05 03:24:17 +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
Sunny Shao
8bd543fce4
Add strings for new Intent Picker
...
bug: 177923646
Test: compilation
Change-Id: Icbd17a2979d0bb135e03103f27a205590cb843b9
2021-03-05 10:29:50 +08:00
jasonwshsu
9584ba6b57
Add seekBar properties 'tickMark' to LabeledSeekBarPreference
...
Bug: 173940869
Test: manual
Change-Id: I135e52181bdb86ded6187a3fa30b9cffeb69d451
2021-03-05 10:27:39 +08: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
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
TreeHugger Robot
e0a922612f
Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev
2021-03-04 23:48:51 +00:00
Weng Su
f71502fb10
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I578a0db27ddf400017d53edadcb13938f398210b
2021-03-04 23:05:59 +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
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
Julia Reynolds
84d83e2923
Add icons to NLS mgmt page
...
Test: manual
Fixes: 181125169
Change-Id: Id8340db5f2901947c4e63e459aad1fee52437a9f
2021-03-04 15:31:25 +00:00
SongFerng Wang
81a1df8f46
[automerger skipped] Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8 am: 1cb02f5e0d -s ours am: 18a6887811 -s ours
...
am skip reason: Change-Id Ia99a4cf4618fcb32162485e7da5e48e3b313ce67 with SHA-1 216b346438 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I586e98d2108fe68391e674e7aed76363c12e2f88
2021-03-04 15:05:11 +00:00
SongFerngWang
b0face5be4
[automerger skipped] Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 am: 959454f32a -s ours am: 351a28418c -s ours
...
am skip reason: Change-Id Ib31e23b81bdbd3b5336b45fc73994f40d021718b with SHA-1 d4a25fd13a is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf68efe87084ee34070f6a6d6487d8cdf14cb0d7
2021-03-04 15:05:08 +00:00
SongFerng Wang
18a6887811
[automerger skipped] Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8 am: 1cb02f5e0d -s ours
...
am skip reason: Change-Id Ia99a4cf4618fcb32162485e7da5e48e3b313ce67 with SHA-1 216b346438 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec2ac0ac303394d15d5540c6050ea9ecc989e3ff
2021-03-04 14:48:19 +00:00
SongFerngWang
351a28418c
[automerger skipped] Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 am: 959454f32a -s ours
...
am skip reason: Change-Id Ib31e23b81bdbd3b5336b45fc73994f40d021718b with SHA-1 d4a25fd13a is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I87e7116e1731b417e605330d2ddf5a5f1b594862
2021-03-04 14:48:16 +00:00
Stanley Wang
664824e532
Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev am: a380b04d7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746323
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I75a8d4f63453d2b369d7274eb360ce5be35a3ab4
2021-03-04 14:43:33 +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
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
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
SongFerng Wang
d5ff766ed8
Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife74a181399e5c10866b92663f56a2e0077bc9c4
2021-03-04 13:11:01 +00:00
SongFerngWang
18c15a2545
Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0892ae8b68eff489e2274aad56588d3c918a369e
2021-03-04 13:10:46 +00:00
Stanley Wang
29693a2fee
Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev am: c4d839e3df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746187
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1c6191294fa54fbebe51dc50e206b1b787e02028
2021-03-04 13:10:17 +00:00
Calvin Pan
f8fdb4dd27
Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev am: 41a7293038
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13656807
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib3bd1779077a6b41dd08c18be77f5027e4ea4f6e
2021-03-04 13:09:26 +00: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