Hugh Chen
b6e7632fc5
[automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af
to rvc-qpr-dev am: dc2b694a54
-s ours am: 9d153e6331
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13278059
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I509b0b17ff15db95e2a89b7578df24521008d14e
2021-01-07 18:55:14 +00:00
TreeHugger Robot
8c2cbae90a
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
am: 0b9260031d
am: b9faf1cd4a
am: 072b5f4bda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I43d14c1a953f1ae7183acfddd88bf0384f5637f5
2021-01-07 18:31:47 +00:00
Hugh Chen
99b1567fc2
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d
am: 5108e1bd83
-s ours am: 13a927cb9c
am: b16061d3ad
am: b21ad75989
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29353db2b0e9063601aaa8d69baa037c146b943a
2021-01-07 18:31:46 +00:00
Hugh Chen
5338b30942
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
am: 84f9417fa2
-s ours am: fc0292dc19
am: 724278a1fa
am: 0dd7f8dbef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I98f1e8a2518ee278963fd4f63edf7b043445dd14
2021-01-07 18:31:37 +00:00
Hugh Chen
6591058f84
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
am: 535f5ba053
-s ours am: d62def70c7
am: bfd2571c3b
am: 28243b2996
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74b19a40f47bf2c67ba55cbd9c158c34320a75b8
2021-01-07 18:31:36 +00:00
TreeHugger Robot
0dd34e2c31
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours am: c5f7e582b4
am: 5bd40911f5
-s ours am: 6bae86bec6
am: 7ff97d7703
am: 17fd90a341
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82d2b0993fcd5c12491f43453cbb94479caf911f
2021-01-07 18:31:23 +00:00
Hugh Chen
cb79c659b5
RESTRICT AUTOMERGE Update String am: 085f70d48d
am: 4b22b601f7
am: 26623c9572
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I84520568c24220945c1ce226bafb82f7a40367af
2021-01-07 18:31:16 +00:00
Hugh Chen
9d153e6331
[automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af
to rvc-qpr-dev am: dc2b694a54
-s ours
...
am skip reason: Change-Id Iec4d1963e626829b696c2047c5979a684119acf7 with SHA-1 18c06480b0
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13278059
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b45cbf704ffd1558b681a4835bc628dcc132894
2021-01-07 18:31:10 +00:00
jasonwshsu
bab448a610
Fix crash when rotating the device on magnification mode dialog
...
Root Cause:
1. onActivityCreated() has been deprecated
2. mCapabilities will be 0 when updateAlertDialogEnableState(),
because onCreateDialog() will get mCapabilities
but it will be called after onCreate() and before onCreateView();
onActivityCreated() will set mCapabilities but it will be called after onCreateView()
Solution:
Move deprecated flow onActivityCreated() into onCreate() to set mCapabilities first
Bug: 172171402
Bug: 168567356
Test: atest MagnificationSettingsFragmentTest
Change-Id: Id9f861d59fa23f5cb77aac55b87152e921246135
2021-01-08 02:04:47 +08:00
TreeHugger Robot
072b5f4bda
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
am: 0b9260031d
am: b9faf1cd4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icdf9619be3a9f6dc1cfc69d2c838d4bc3029746b
2021-01-07 17:59:36 +00:00
Hugh Chen
b21ad75989
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d
am: 5108e1bd83
-s ours am: 13a927cb9c
am: b16061d3ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20fbb662bb62a0a9437b7164905d9bc1960a8460
2021-01-07 17:59:34 +00:00
Hugh Chen
0dd7f8dbef
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
am: 84f9417fa2
-s ours am: fc0292dc19
am: 724278a1fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I76108459fe13df49071b464214a19ea922e7ddbb
2021-01-07 17:59:27 +00:00
Hugh Chen
28243b2996
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
am: 535f5ba053
-s ours am: d62def70c7
am: bfd2571c3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I716d7f0489e21ffc81cfbbaee3736b9d518fbd72
2021-01-07 17:59:25 +00:00
TreeHugger Robot
17fd90a341
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours am: c5f7e582b4
am: 5bd40911f5
-s ours am: 6bae86bec6
am: 7ff97d7703
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5217c3e1ba592879564a6934c69fa951f91d6544
2021-01-07 17:59:16 +00:00
Hugh Chen
26623c9572
RESTRICT AUTOMERGE Update String am: 085f70d48d
am: 4b22b601f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d34d26cddbca6559164cbaef2aab5dfc6fd035d
2021-01-07 17:59:08 +00:00
Mill Chen
7dc12ac274
Update the message for FingerprintEnrollIntroduction
...
Seperate the original message into top info and footer info.
Bug: 176856169
Test: visual verified
Change-Id: I9f79619f84949cd88e1f80024d8689033ab4304a
2021-01-08 01:41:52 +08:00
Steven Liu
70a74e1313
Fix the unit test failure of WifiPickerTrackerHelperTest
...
Bug: 176945457
Test: atest SettingsUnitTests
Change-Id: I25ab3d57c8bf09effcd8aa82a316f64f33d2237a
2021-01-07 08:53:31 -08:00
Julia Reynolds
eb2b36a5e2
Allow notification filtering per listener.
...
Test: atest
Bug: 173052211
Change-Id: I54c740e9755f18339c59aad4f1f5aecd8c734892
2021-01-07 10:01:08 -05:00
Mill Chen
63c4595b65
Add the mutability flag to the pendingIntent
...
Since Android S, it's required to specify a mutability flag
when creating a PendingIntent.
Fixes: 172812025
Fixes: 172811729
Test: robotests
Change-Id: Ia77c189c99712eea524fb1bf68e39a087dcba95c
2021-01-07 20:31:44 +08:00
Weng Su
c33f69673a
[Provider Model] Replace WiFi panel to Internet panel
...
- Replace the android.settings.panel.action.WIFI panel
- Provider Model Disable: Wifi panel
- Provider Model Enabled: Internet panel
Bug: 172707942
Test: manual test
- adb shell am start -a android.settings.panel.action.WIFI
- atest PanelFeatureProviderImplTest
Change-Id: I9f111e96385452b586971d4c28988b564d4e25f4
2021-01-07 11:55:28 +00:00
TreeHugger Robot
0fd2a2008a
Merge "Move Settings preferenceCategory style into SettingsTheme"
2021-01-07 11:20:37 +00:00
TreeHugger Robot
12a5868126
Merge "Only show the schedule text for the night display and dark theme"
2021-01-07 10:30:46 +00:00
TreeHugger Robot
6cf77c6f88
Merge "Add the mutability flag for SettingsSliceProvider"
2021-01-07 10:28:23 +00:00
TreeHugger Robot
617d581f9b
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
am: 0b9260031d
am: a294dac526
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8cf49da12694d8aa84ee72b6712539a0142610a8
2021-01-07 09:32:13 +00:00
Hugh Chen
6ac784dcfd
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d
am: 5108e1bd83
-s ours am: 13a927cb9c
am: 5a01cc4489
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ida50335a531f3597749292e621338fe44e284b9b
2021-01-07 09:32:11 +00:00
TreeHugger Robot
a294dac526
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
am: 0b9260031d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bee116fd12d811e2e3f9ecb181530199605f8b0
2021-01-07 08:35:39 +00:00
Hugh Chen
5a01cc4489
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d
am: 5108e1bd83
-s ours am: 13a927cb9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81992f44a83997ab81cc52749f61ed64b5dca98a
2021-01-07 08:35:38 +00:00
TreeHugger Robot
5f5c7539bb
Merge "Add toggle for auto brightness feature"
2021-01-07 08:35:02 +00:00
TreeHugger Robot
b9faf1cd4a
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
am: 0b9260031d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91781bbb80f03df2a4927b8aa9fe530d6d62ce31
2021-01-07 08:34:46 +00:00
Hugh Chen
b16061d3ad
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d
am: 5108e1bd83
-s ours am: 13a927cb9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c8c5cf66414e4ca6a89edc36209ab5b1726183f
2021-01-07 08:34:43 +00:00
TreeHugger Robot
0b9260031d
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5baf77f1f44a4bcc5c6f6632c3658a1777f5af17
2021-01-07 08:19:36 +00:00
Hugh Chen
13a927cb9c
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d
am: 5108e1bd83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6926664e21281b3f9567e430b62837ae09c02cd
2021-01-07 08:19:34 +00:00
Tsung-Mao Fang
acab1a0364
Only show the schedule text for the night display and dark theme
...
In Android S design, night display and dark theme only show
schedule text for summary.
- Rmove redundant string resource.
- Remove redundant method in night display formatter.
- Refactor the code in dark mode preference and night display
controller.
Test: See the correct behavior in screen.
Fix: 174964139
Change-Id: I658b3073a0a6ed83f589103999c711e5430eaeb7
2021-01-07 16:17:20 +08:00
TreeHugger Robot
af29a157db
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf935ec22f8f61936be068b4771af406ae56599b
2021-01-07 08:05:54 +00:00
Hugh Chen
5108e1bd83
RESTRICT AUTOMERGE Update String am: 19aeca103d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e4b9032a22e5306c5e10ff54f75dd4739199605
2021-01-07 08:05:52 +00:00
Yi-Ling Chuang
843616eb69
Add the mutability flag for SettingsSliceProvider
...
Starting Android S, all PendingIntent should have the mutability flag
assigned to prevent from vulnerability.
Fixes: 172811605
Fixes: 172206649
Test: 1. Play on the slices in Settings search.
2. Make a permission request intent of Settings wifi slice in the
slice-viewer app, clicking on it and make sure it gets redirect to
Settings without crashes.
Change-Id: I86f915bc062a6e632b5ca9c74e232db1036f08de
2021-01-07 16:00:08 +08:00
TreeHugger Robot
c0cd669bef
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev
...
* changes:
RESTRICT AUTOMERGE Update String
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
2021-01-07 07:22:54 +00:00
Tsung-Mao Fang
d159567fc4
Add toggle for auto brightness feature
...
- Use the primary toggle preference.
- Remove the empty subtext.
Test: See toggle preference on auto brightness feature
Bug: 174964139
Change-Id: Ic5105730c7a2075d61cdde42395e41712bb468a7
2021-01-07 15:09:31 +08:00
Hugh Chen
dc2b694a54
DO NOT MERGE: resolve merge conflicts of c17ec818af
to rvc-qpr-dev
...
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Iec4d1963e626829b696c2047c5979a684119acf7
2021-01-07 06:03:10 +00:00
Hugh Chen
aaf2ad7738
[automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af
to rvc-qpr-dev am: 18c06480b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13294249
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic6e7de3bd526b0419f6fc1513bbc040e44982b0d
2021-01-07 05:18:27 +00:00
Edgar Wang
085d36f97d
Make Autofill category in developer options can not be search
...
Bug: 171510328
Change-Id: I388c02d6a8d3c1caa9d2325dc89fb9130291d0a8
Test: manual
2021-01-07 04:26:36 +00:00
Hugh Chen
50ab9ab26a
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
am: 84f9417fa2
-s ours am: fc0292dc19
am: 8cdb990020
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic24199051178b3fcc0e495b94227e3d60ab7b0c1
2021-01-07 03:59:09 +00:00
Hugh Chen
8f463185c5
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
am: 535f5ba053
-s ours am: d62def70c7
am: 81ec3d158d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff9bf9ac88cb673abd5c8d723fca7dfd28a7f6c8
2021-01-07 03:59:08 +00:00
TreeHugger Robot
17afd98228
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours am: c5f7e582b4
am: 5bd40911f5
-s ours am: 6bae86bec6
am: f6277c3e3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I958515c65c9340b72109997a13d0e47a96e7225c
2021-01-07 03:58:55 +00:00
Hugh Chen
18c06480b0
DO NOT MERGE: resolve merge conflicts of c17ec818af
to rvc-qpr-dev
...
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Idc6ef558b692115bb82ea58cf223f5919b618633
2021-01-07 11:54:30 +08:00
Edgar Wang
32146d287b
Fix crash when TestingSettingsBroadcastReceiver handling intent
...
Bug: 159625330
Test: robotest & adb shell "am broadcast -n com.android.settings/.TestingSettingsBroadcastReceiver"
Change-Id: I6e46c30274937bd672d20a6786cc70615aaaefd9
2021-01-07 03:52:27 +00:00
Peter_Liang
34829bdcbc
Add test cases for ToggleAutoclickCustomSeekbarController.
...
Bug: 168567356
Test: atest ToggleAutoclickCustomSeekbarControllerTest
Change-Id: Ie69b8788482ecaddadb31b0339d3175a26881ed8
2021-01-07 11:50:58 +08:00
Hugh Chen
8cdb990020
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
am: 84f9417fa2
-s ours am: fc0292dc19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I494046bd04f391b0f5d3859bc40af69e73af330a
2021-01-07 03:23:32 +00:00
Hugh Chen
81ec3d158d
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
am: 535f5ba053
-s ours am: d62def70c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I16fddbd3bf1edb8f99b0b688dbeb0b0b8c5b3923
2021-01-07 03:23:31 +00:00
TreeHugger Robot
f6277c3e3a
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours am: c5f7e582b4
am: 5bd40911f5
-s ours am: 6bae86bec6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I628383fcd3cd23d8a0de79e7024ca8ee9fa68272
2021-01-07 03:23:19 +00:00