Menghan Li
1e39465e45
Merge "Fix glifLayout is not align the preference in SuW" into sc-dev am: ceed5d817b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639274
Change-Id: Ie0bcaefca198f90138a8da406f1d2fc00861d883
2021-05-20 06:25:33 +00:00
Menghan Li
ceed5d817b
Merge "Fix glifLayout is not align the preference in SuW" into sc-dev
2021-05-20 06:13:05 +00:00
TreeHugger Robot
9c5c63caf0
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601 am: 7f7cf45879 am: 4052fcc8bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150
Change-Id: I3485c6995336a54c1e33ab7ff7e4f7c162b3bf08
2021-05-20 05:12:03 +00:00
TreeHugger Robot
f3ee9aac82
Merge "Setting result earlier than onPause" into sc-dev am: c57c351060 am: bd016efe52 am: 33a02ecb1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113
Change-Id: Ie3276d623b439293913f663d165e08a653053e54
2021-05-20 05:04:14 +00:00
TreeHugger Robot
4052fcc8bf
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601 am: 7f7cf45879
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150
Change-Id: I32e13fb5e90283fd932e132e86daf4ba769d5df2
2021-05-20 04:46:07 +00:00
Jack Yu
0ac4d497ff
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985 am: a67151ad2f am: 2b2a1f8894
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359
Change-Id: Ia8fd7d39bc1eca409b573055830e049f32bdd056
2021-05-20 04:45:48 +00:00
TreeHugger Robot
f154e231f9
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150
Change-Id: I3161025c6c61529213cf99b38306ca287f657a51
2021-05-20 04:22:06 +00:00
TreeHugger Robot
2cc1c91601
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev
2021-05-20 03:54:57 +00:00
menghanli
b9fefba02a
Apply color extraction for vision settings
...
Bug: 183713013
Test: Run initBCTestEnv_S.sh and apply different color
Change-Id: I2420a6af0f0f975396003e4c5531701bfb8373f4
2021-05-20 11:48:22 +08:00
Antoan Angelov
d9365b8d65
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a am: 8019ba0d5b am: 3bd2b1cae2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130
Change-Id: I13048f5d63c1f58a66605aae4f1ef1a53f94ae0e
2021-05-20 02:04:33 +00:00
ykhung
fd843b337a
Add metric for new battery relative functions for S (1/2) am: a3d3c22a27 am: ae66f84815 am: 4ae06f8823
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866
Change-Id: I8abc984dd439f672b4f03635512e4931a358da40
2021-05-20 01:56:03 +00:00
Jason Chiu
b1757fa13d
Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev am: 9f24967458 am: 817fb55032
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622863
Change-Id: If7fde14e37b4ea9d387ac1aef5ccff79502814fd
2021-05-20 01:55:58 +00:00
Peiyong Lin
7d73c61a16
Merge "Add Game settings support." into sc-dev am: d32d11248e am: 4e4a7f0dbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14553339
Change-Id: I9eb8f13aaf68f586ac1068af26459e9db08f1a65
2021-05-20 01:55:47 +00:00
Weng Su
7390717d9e
Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev am: 3d904eba71 am: eccb787bbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622856
Change-Id: I485d82ac7bfc9347def855207796f70b0ac0674b
2021-05-20 01:55:42 +00:00
Weng Su
c1382e3007
Merge "Improve discoverability of the intent & actions progress" into sc-dev am: ca5f4e4952 am: 46d3fc525e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622857
Change-Id: If6651e153ac623305f933bee6cb57a02b753d905
2021-05-20 01:55:37 +00:00
TreeHugger Robot
d9db863dc2
Merge "Apply color extraction for Fingerprint enrollment" into sc-dev am: bac284a622 am: 08e146982b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622855
Change-Id: If690c8a00cbfd9b4c1cc393fa7884f216c14ab65
2021-05-20 01:55:32 +00:00
TreeHugger Robot
8492c7d2d8
Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev am: 6d550713dd am: d3f0fc54a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554361
Change-Id: Ie42ed795854ffece613af6c8cc1f68b37c75be25
2021-05-20 01:55:16 +00:00
TreeHugger Robot
be234f3d1e
Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev am: 4a67b1c099 am: 7bb6afbfd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554357
Change-Id: Iece2f329fbe702dca296dd7d169cb2457003387c
2021-05-20 01:55:11 +00:00
TreeHugger Robot
91960f18ff
Merge "Controls/Pay - Use new privacy setting" into sc-dev am: 4335268c81 am: ba061c91ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551073
Change-Id: I0120102362ad110f7895f665f2ada9b6d03742e8
2021-05-20 01:55:06 +00:00
YUKAI HUNG
bcadb99952
Merge "Align system time 12-24 hour format in the time slot information" into sc-dev am: 80f2f43d59 am: bf06c3c5f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609994
Change-Id: I2db00287ba2d4799ac6d20786f0cf90588fa282d
2021-05-20 01:54:55 +00:00
ykhung
f22ae10b9b
Add metric for battery defender am: 6590b368f2 am: 7acf3fc852
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554360
Change-Id: I7271cb28f899eaa816d1243795dde3e8d91766b5
2021-05-20 01:51:00 +00:00
TreeHugger Robot
06e5421dbe
Merge "Fix search highlight issues" into sc-dev am: 03099c04bd am: 66675b3e50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519527
Change-Id: I30cd01bcd5bfde167a7a495b89e8293db642cd0a
2021-05-20 01:50:48 +00:00
Evan Severson
a988c56a25
Merge "Update the settings privacy page to the latest mocks" into sc-dev am: 39e7cb2721 am: 1f2542e62c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215739
Change-Id: I2b55b8e2be72c50fb51c9f97fb6cab0c3e7c0584
2021-05-20 01:50:42 +00:00
TreeHugger Robot
58b7334199
Merge "Expose Lock screen settings page." into sc-dev am: cbb2bd6d13 am: 80b90cfadf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14544233
Change-Id: Ifbfb627d760c7f4aeb0e6e692443f8df7a54830c
2021-05-20 01:50:35 +00:00
YUKAI HUNG
4ee71b0d29
Merge "Fix legacy failed unit test for BatteryInfoLoader" into sc-dev am: 10559fb9de am: c0ab21eaa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554353
Change-Id: I411b4a3f82ba8e0db4df8380a7de74a588af1294
2021-05-20 01:50:28 +00:00
Menghan Li
de8f4193a0
Merge "Remove above divider of main switch" into sc-dev am: c6e056b7f4 am: d5c5b6606d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554350
Change-Id: I891834adc7438bc7f752c6666ae15927a47dfd06
2021-05-20 01:50:21 +00:00
Menghan Li
728dfaceb2
Merge "Fix “Learn more” link not working on Magnification shortcut page from Vision Settings" into sc-dev am: 94ac5181ba am: b11c11196c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554349
Change-Id: I4cc27a0e25897dc6e77a8dc0e3f47b36f76a5ce1
2021-05-20 01:50:15 +00:00
Arc Wang
0052f7f46a
Rename audios to audio am: 6062b6491d am: 9c191a1018
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518465
Change-Id: I274afecba4917ab6cc52274943f7132b7fa44e5c
2021-05-20 01:50:08 +00:00
Arc Wang
f11ab2eed1
Storage Settings shift profile selection tab position am: c0b5ba5225 am: 44bc515588
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441414
Change-Id: I757e81ee5eff34596b850fe8d2d6a73168d823db
2021-05-20 01:50:03 +00:00
Treehugger Robot
51f86d8efd
Merge "Settings: remove Bluetooth related text from DNS-dialog" am: ca3051403f am: a786f86808 am: 21c08903e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708562
Change-Id: Ia9bf1c6e6bdcd6a39a94f8ebef91d35dc2799566
2021-05-20 01:49:56 +00:00
Yu-Han Yang
791b6fadc7
Fix footer issues
...
1. setContentDescription for "learn more"
2. set searchable="false"
Bug: 187471260
Bug: 188490701
Test: on device
Change-Id: Iaa6907fdf2b6c47cbc1386a88a08ac31f3676367
2021-05-19 18:01:25 -07:00
Weng Su
6eb27a6d0a
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/6nYcmazMM46TxaB
Bug: 177573895
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: I5f857b2079e0f550e4be601d27dd54dac56b2f57
(cherry picked from commit d4cec9b628 )
2021-05-20 00:01:47 +00:00
Hugh Chen
cdf9a1509b
RESTRICT AUTOMERGE Fix unable to send file via OPP
...
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.
This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.
Bug: 186490534
Bug: 179386960
Bug: 179386068
Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0 )
(cherry picked from commit c556938807 )
2021-05-20 00:01:42 +00:00
Hugh Chen
f1d1bb7816
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
...
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.
This CL will not allow to set package name and class name to avoid
the attacker.
Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.
Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249 )
(cherry picked from commit e21d06f6ee )
2021-05-20 00:01:37 +00:00
Jakub Pawlowski
42be5cfa10
Prevent drawing on top of DevicePickerActivity
...
Bug: 182584940
Change-Id: I8b27b397bce1708a42b96b1b647c64e23142c468
(cherry picked from commit 68f799a4c6 )
2021-05-20 00:01:33 +00:00
Tsung-Mao Fang
4493d84ab2
Prevent HTML Injection on the Device Admin request screen
...
The root issue is that CharSequence is an interface.
String implements that interface, however, Spanned class
too which is a rich text format that can store HTML code.
The solution is enforce to use String type which won't include
any HTML function.
Test: Rebuilt apk and see the string without HTML style.
Bug: 179042963
Change-Id: I53b460b12da918e022d2f2934f114d205dbaadb0
Merged-In: I53b460b12da918e022d2f2934f114d205dbaadb0
(cherry picked from commit 0bf3c98b2f )
(cherry picked from commit 52f9039d5c )
2021-05-20 00:01:26 +00:00
TreeHugger Robot
33a02ecb1b
Merge "Setting result earlier than onPause" into sc-dev am: c57c351060 am: bd016efe52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113
Change-Id: Iea82919144c670f7d5d6024ead8f4c8a6fc0372c
2021-05-19 20:46:57 +00:00
TreeHugger Robot
0925ba9f24
Merge "Setting result earlier than onPause" into sc-dev am: c57c351060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113
Change-Id: I81795d747ae1256aba6526c7a681186fdf551072
2021-05-19 20:28:49 +00:00
TreeHugger Robot
c57c351060
Merge "Setting result earlier than onPause" into sc-dev
2021-05-19 20:11:09 +00:00
Yi Jiang
8aaa9f5549
Defers initialization of preferences.
...
In Screen Timeout Settings, preferences should not be initialized in
onAttach() because the setting style hasn't been loaded yet. This change
defers the initialiaztion of those preferences so that they appear
correctly.
Test: manually tested.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540
Change-Id: I86cfe196549d709ed763faa004fff7b631365b1e
2021-05-19 12:18:23 -07:00
Jack Yu
2b2a1f8894
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985 am: a67151ad2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359
Change-Id: Ia7c13617cbc5d429737a4bbb07e34d0b3c76e92f
2021-05-19 16:50:07 +00:00
Jack Yu
9c60e581e8
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359
Change-Id: Id6cec29f31d94a378bd78c630b5a7d571bba64c7
2021-05-19 16:47:43 +00:00
Jack Yu
3616520985
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev
2021-05-19 16:26:18 +00:00
Jason Chang
ecb58cbbc5
(2/n) Stop user from enabling OHM setting if user is using 3-button
...
mode
Return One-Handed mode getAvailabilityStatus to UNSUPPORTED_ON_DEVICE
when SystemNavigationMode is 3-button.
Bug: 184903678
Test: manual
Test: manual verified on Settings > System > Gesture page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.SwipeBottomToNotificationPreferenceControllerTest"
Change-Id: I454dabb5cc267d544732fa5079f3146154d0568c
2021-05-20 00:25:26 +08:00
Antoan Angelov
3bd2b1cae2
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a am: 8019ba0d5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130
Change-Id: I52b3d1cd995eefab222e447072f13eb3571250e8
2021-05-19 14:30:50 +00:00
Antoan Angelov
57d52482cc
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130
Change-Id: I1d2ca81504f78e98d2f27d34ca8b037ffc433719
2021-05-19 14:05:09 +00:00
Antoan Angelov
eb45fd3f2a
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev
2021-05-19 13:50:06 +00:00
ykhung
4ae06f8823
Add metric for new battery relative functions for S (1/2) am: a3d3c22a27 am: ae66f84815
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866
Change-Id: I4c37546aad5a789451ed45ff58737198687cc6b8
2021-05-19 12:57:33 +00:00
ykhung
98aafd8500
Add metric for new battery relative functions for S (1/2) am: a3d3c22a27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866
Change-Id: I81540aec054edadc9d34c6f46337c398a3bb11ba
2021-05-19 12:36:22 +00:00
ykhung
a3d3c22a27
Add metric for new battery relative functions for S (1/2)
...
Reference the table from PM requested:
https://docs.google.com/spreadsheets/d/1TC_6MLVMvOS0p1ic0wPfQ-19AOuY8Kc8FUJdqaQSM4I/edit?ts=6098b296#gid=0
Bug: 188505537
Test: make SettingsRoboTests
Change-Id: I2a4df9ab900cbeaf9885bb2dbc21ea848920bc81
2021-05-19 12:22:20 +00:00