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
Felipe Leme
cc7f845fdd
Refactored Settings calls to removeUserOrSetEphemeral().
...
Test: atest com.android.car.user.CarUserServiceTest \
android.car.apitest.CarDevicePolicyManagerTest#testRemoveUser_whenDisallowed
Bug: 170887769
Change-Id: If797ace64c0fa0262116f649212bbcb1d61e2046
2021-01-06 23:41:37 -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
Hugh Chen
724278a1fa
[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: Ic42e806534d2476d4ce959d6f75bcdf507860500
2021-01-07 03:23:01 +00:00
Hugh Chen
bfd2571c3b
[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: If9c9277378921ced9ed919cd9e03811acce59c55
2021-01-07 03:23:00 +00:00
TreeHugger Robot
7ff97d7703
[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: Ic95f4362c186a2aa00edfe54391b44cd37574fbf
2021-01-07 03:22:46 +00:00
Hugh Chen
fc0292dc19
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
am: 84f9417fa2
-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: I3dafec35dab7457e6301017b49cd9b3b92491869
2021-01-07 02:40:55 +00:00
Hugh Chen
d62def70c7
[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 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: I5e04a58a35ea2c11731a8ec2e8661080e28ccd77
2021-01-07 02:40:54 +00:00
TreeHugger Robot
6bae86bec6
[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 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: I1180cd764b23ee4687e353777c68be177c2b71aa
2021-01-07 02:40:47 +00:00
Hugh Chen
84f9417fa2
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I237872bf9d2d67b2da1087ebedd0c753b00bcfd2
2021-01-07 02:16:44 +00:00
Hugh Chen
535f5ba053
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I872358cea725ef692d6193a6d09eca966ecc3e8d
2021-01-07 02:16:43 +00:00
TreeHugger Robot
5bd40911f5
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours am: c5f7e582b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb64d2ddbcf8659ff32029b93a266e89ed04cde5
2021-01-07 02:16:37 +00:00
Hugh Chen
77d2c798e5
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-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: I8d018bfd516557b7a643842a1538e59053f1706e
2021-01-07 01:56:51 +00:00
Hugh Chen
5036eee733
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-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: Iec4bc73ee0fd32c31d67f8bb5fef7b1c1e31e32c
2021-01-07 01:56:50 +00:00
TreeHugger Robot
c5f7e582b4
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-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: If4601e6a2be1265e01baea5e73f34d7989d6fcad
2021-01-07 01:56:43 +00:00
Hugh Chen
57358903b3
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-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: I94614a9cac3555ec44d6cfef6e7af4a6b24f6272
2021-01-07 01:55:50 +00:00
Hugh Chen
d6bc0a328f
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-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: I0e109407102ce058e806f3a239882dc8abaa36a7
2021-01-07 01:55:49 +00:00
Ben Chung
cfedc19ab9
Merge "Accessibility settings display category restructure, add text and display fragment for related accessibility services."
2021-01-07 01:28:17 +00:00
TreeHugger Robot
1a6a1b12ef
Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev
2021-01-07 01:27:50 +00:00
Steven Liu
7f05bd4dfc
Merge "Introduce a WifiTrackerLibProvider."
2021-01-07 00:58:49 +00:00
Hugh Chen
52fc02b96c
[automerger skipped] RESTRICT AUTOMERGE Update String am: 085f70d48d
am: c148c76b20
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c9629244c8fdfa5e69932a78acb252ae9add4bb
2021-01-07 00:19:09 +00:00
Hugh Chen
7632d248f8
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece
am: bac6aab059
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb46ed89a1dc98e18cd735880d45654959a879c3
2021-01-07 00:18:59 +00:00
Hugh Chen
c148c76b20
RESTRICT AUTOMERGE Update String am: 085f70d48d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c78e392639cd06925ba054dfb7e2980b36d06ef
2021-01-06 23:33:23 +00:00
Hugh Chen
bac6aab059
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23b2b58f32f48b20313df6a02efc6b6b6fda8e86
2021-01-06 23:33:07 +00:00
Hugh Chen
4b22b601f7
RESTRICT AUTOMERGE Update String am: 085f70d48d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e8afa7b93740d3653a8a6cfb476ac69023ae41b
2021-01-06 23:32:41 +00:00
Hugh Chen
c17ec818af
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I96867a323781675c52bf875c2221c348baca6b83
2021-01-06 23:32:22 +00:00
Stephane Lee
b9b67ee815
Add adaptive charging to the top level settings menu
...
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
Merged-In: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
(cherry picked from commit b60870cb7d
)
2021-01-06 21:59:42 +00:00
Peter Kalauskas
f22eb5971d
Merge "Update icons and text for guest user"
2021-01-06 17:41:26 +00:00
Steven Liu
c1477650c9
Introduce a WifiTrackerLibProvider.
...
This make the WifiTrackerLib can be customized.
Bug: 149540986
Test: manual test wifi picker, and atest com.android.settings
Change-Id: I1418ae39c895ce2ff87f18005a226a4835f9e083
2021-01-06 08:44:34 -08:00
Edgar Wang
e49ae19b1e
Merge "Replace some customized RadioButtonPreferences"
2021-01-06 16:31:02 +00:00
PETER LIANG
bed8dee669
Merge "Add test cases for RingVibrationIntensityPreferenceController."
2021-01-06 15:57:11 +00:00