TreeHugger Robot
0a6a65d8d0
Merge "Add strings for new Intent Picker" into sc-dev
2021-03-05 06:31:27 +00:00
Weng Su
3fb9083a66
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6
-s ours am: 9da6b6f4ae
-s ours am: b2af05bf21
-s ours am: 66be7c55a2
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
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: Iad2b19c3cc801589f4e5067ad6383415219b0d3b
2021-03-05 06:20:28 +00:00
TreeHugger Robot
3f925449c7
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f
-s ours am: f0c01c5368
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
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: Ib0cd261a7dba74f3e079654358a048f3d062fbda
2021-03-05 06:20:07 +00:00
Weng Su
e82b74e43c
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb
am: f71502fb10
am: 2a0cad3a2a
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
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: I772b4de954c55d1f9d8a18e4386b74477a6c8c7e
2021-03-05 06:19:21 +00:00
Weng Su
5fe3617755
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6
-s ours am: 9da6b6f4ae
-s ours am: b2af05bf21
-s ours am: 0dfeac5326
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
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: Idd1840366161db05f9ca1c772ea2b2b866fb4efa
2021-03-05 06:15:42 +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
Janis Danisevskis
e0a303f6b6
[automerger skipped] Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331
am: bae6535b75
am: bb5ebce8a0
-s ours
...
am skip reason: Change-Id I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5 with SHA-1 b5caf84154
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide6d1137c16bc0772e15fcccf8fd35b5d4da806f
2021-03-05 05:59:24 +00:00
Weng Su
66be7c55a2
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6
-s ours am: 9da6b6f4ae
-s ours am: b2af05bf21
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
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: Ic21478386815ca5cd2f7513faf586d42963506e3
2021-03-05 05:59:16 +00:00
Weng Su
0dfeac5326
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6
-s ours am: 9da6b6f4ae
-s ours am: b2af05bf21
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
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: Ia6fd81b8b5e62d1814025fde12010f158268cac8
2021-03-05 05:54:38 +00:00
Ahaan Ugale
a5571da12b
AF: Show passwords settings for available autofill service.
...
Separates autofill preferences into 2 categories - one for the passwords
settings and one for the existing default service preference.
The passwords preference controller dynamically creates preferences for
each autofill service.
Bug: 169455298
Test: manual
Test: TODO new test for controller
Change-Id: I369b5db00be75957c869df4d960595e9e1d9772c
2021-03-04 21:49:42 -08:00
Janis Danisevskis
bb5ebce8a0
Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331
am: bae6535b75
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4395ebf453fd712d9870580a90c370b42a770d7a
2021-03-05 05:41:50 +00:00
SongFerng Wang
ccadb9e31d
[automerger skipped] Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664
am: 29594edb70
am: cc1715e2c0
-s ours
...
am skip reason: Change-Id I2b981569ad11cf70a558c1952cc2e077464328d8 with SHA-1 60c4163244
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If823671f456d27da7f701ca93e2f86fcf74a13bd
2021-03-05 05:22:05 +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
Treehugger Robot
86b03a2578
[automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3
am: c4f1bd9675
-s ours am: 2b35467feb
-s ours
...
am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c74864579
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idcea8bb13a8605130991784226cab7f909dedda4
2021-03-05 05:17:13 +00:00
Janis Danisevskis
bae6535b75
Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f252dc43dfc8494e7cceb3b559b7252cd99697c
2021-03-05 05:17:11 +00:00
TreeHugger Robot
df6133e2b9
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f
-s ours am: 0d290a85c7
-s ours am: 82d0f7a11b
-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: I38a19586d3792946dc61a73315a0affe90b2d787
2021-03-05 05:16:18 +00:00
Weng Su
2bf462851c
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb
am: f71502fb10
-s ours am: 739bf235e5
-s ours am: c271a656a7
-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: Ieab165588cac75977ce1a4737f401e49ff2af825
2021-03-05 05:14:39 +00:00
tim peng
a79726325b
[automerger skipped] Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev am: d082221652
am: cd4df5a1d3
-s ours
...
am skip reason: Change-Id Ic37b37bdbe6de6bdbad741985d3a920334240d80 with SHA-1 40d4e47b05
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241059
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0fd18d47c37238abec9f5f7c3cddf7645242b6ea
2021-03-05 05:13:09 +00:00
Treehugger Robot
2b35467feb
[automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3
am: c4f1bd9675
-s ours
...
am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c74864579
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e09bb1966a414fa31fe3de39be2b945d7e39722
2021-03-05 05:11:51 +00:00
Weng Su
b2af05bf21
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6
-s ours am: 9da6b6f4ae
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
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: I909b96de08c455dd659c8cf9fbf19f52722622e7
2021-03-05 05:07:57 +00:00
SongFerng Wang
29594edb70
Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb1dc1653e5d33d4f21760aabb203cf40adcbdba
2021-03-05 05:00:14 +00:00
TreeHugger Robot
82d0f7a11b
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f
-s ours am: 0d290a85c7
-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: Ia9490d4938e188774ad9700518fe7e2ec61b6889
2021-03-05 04:47:22 +00:00
TreeHugger Robot
f0c01c5368
[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: Iffb7e0ebc39de25f279ecf75d3eee8491c3f3bbb
2021-03-05 04:30:53 +00:00
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
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
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
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
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