Commit Graph

84825 Commits

Author SHA1 Message Date
Menghan Li
5e92366f83 Merge "Apply color extraction for vision settings" into sc-dev 2021-05-20 07:10:04 +00:00
Jason Chiu
f67554f114 Merge "Skip indexing dynamic and injected raw data when page search is disabled" into sc-dev am: be9f37cfad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542663

Change-Id: Ibad1115dd927decbb9ef758327cef42af189c1a0
2021-05-20 06:49:45 +00:00
Jason Chiu
be9f37cfad Merge "Skip indexing dynamic and injected raw data when page search is disabled" into sc-dev 2021-05-20 06:40:03 +00:00
Arc Wang
e780d3f652 Merge "Fix UnsupportedOperationException in Display Settings" into sc-dev am: cb1574319b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639272

Change-Id: Ic5e978c9313eead23fcc39a9974641c0a6adf302
2021-05-20 06:35:42 +00:00
Jason Chiu
1ee1911104 Skip indexing dynamic and injected raw data when page search is disabled
Test: robotest
Fixes: 188059978
Change-Id: I99c86ee12c7696123df26c47cfed8c3ddfbdf353
2021-05-20 06:34:08 +00:00
Arc Wang
cb1574319b Merge "Fix UnsupportedOperationException in Display Settings" into sc-dev 2021-05-20 06:27:18 +00:00
menghanli
6d2357b251 Fix contrast ratio of some text in Audio adjustment page are too low am: 5eb4edad0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14646253

Change-Id: Id976401938ce6bc0317eee8fd4672d3854df6c28
2021-05-20 06:25:37 +00:00
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
Bill Yi
9e877ea7a1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia86391259a32ec44647d63eb7ff1b7e22c86165c
2021-05-20 06:24:14 +00:00
Bill Yi
400bad3112 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If2bf582edebcec6c5e97188aa424970b51cb95ad
2021-05-20 06:15:53 +00:00
menghanli
5eb4edad0e Fix contrast ratio of some text in Audio adjustment page are too low
Apply same the sub text style from seekbar preference

Bug: 188603038
Test: Manual testing
Change-Id: I6e3db2657a02ac885b16309546e7f2224775a194
2021-05-20 06:13:57 +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
Bill Yi
751558e277 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1a2de6f91ee8de5cad4a8edaa66873ddd1c795ef
2021-05-20 06:11:46 +00:00
Bill Yi
43e1bda57a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I183b7e7e5d5e82c5a3ce7814bf65eb6ca7118bdc
2021-05-20 06:08:32 +00:00
Bill Yi
99932d0fd0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id7ed57d4aed6b801f9819e5709c117b838b5f0fc
2021-05-20 06:05:51 +00:00
Bill Yi
2098a1780e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8595270cabb005ca6a64f0c5503728ae2464f5a0
2021-05-20 06:02:34 +00:00
Tsung-Mao Fang
afffb1dd2f Should not show top intro in search
Set not searchable for top intro of credential page

Test: No top intro result in settings app.
Fix: 188491690
Change-Id: Ia7c4b33f72e3ea962073a552a7f57fa2072a2aa6
2021-05-20 14:02:05 +08:00
Mill Chen
ef8f5c5ca4 Fix overlapping problem for device admin page
The content of Activate device admin app is overlapping with the title
while scrolling up. That is because the collapsing toolbar needs to
work with the view that supports nested scrolling feature, and this page
hasn't updated the layout to use NestedScrollView. So that caused the
overlapping problem.

Fix: 188184864
Test: visual verified
1) Navigate to Settings > Security > Device admin apps > pick up one to
activate
2) Scrolling the content and see if the content is overlapping with the
title

Change-Id: Ide5ff9ed40202c3b217934db93c82a4861983416
2021-05-20 13:56:52 +08: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
android-build-team Robot
4527373200 Snap for 7380537 from c57c351060 to sc-release
Change-Id: I0a9ae8a197ffb2cfa7d128d44cd9c3a537c32d1f
2021-05-20 01:08:33 +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
Arc Wang
4a2acd2e20 Fix UnsupportedOperationException in Display Settings
Remove android:textColorHint from Theme.Settings to fix the regression.

This is a quick fix, each EditText should set its hintTextColor
attribute before there is a fix to apply the attribute globally in
Settings APP.

Bug: 188405076
Test: manually launch 'Font size' and 'Display size'.
Change-Id: If3313be47e0c3e8ce9d41a6e87cdf2e7067ce54b
2021-05-20 01:01:21 +00:00
android-build-team Robot
dca157401c Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594, 14651881, 14651915, 14651882, 14651883, 14651799, 14652154, 14651595, 14651760, 14652271, 14652272, 14652273, 14652056, 14651800, 14651801, 14651802, 14651884, 14651885, 14651886, 14652274, 14652275, 14652276, 14652277, 14652278, 14651894, 14651723, 14652211, 14651895, 14651916, 14651887, 14651888, 14651596, 14651889, 14652212, 14651761, 14652310, 14652311, 14651973, 14651974, 14652312, 14652313, 14651896, 14651803] into rvc-qpr3-release
Change-Id: I0a9683386c56a49e943a391c569415a357bf4809
2021-05-20 00:04:38 +00: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
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
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
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
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
menghanli
0afc2de85e Fix glifLayout is not align the preference in SuW
Bug: 186076332
Test: Run initBCTestEnv_S.sh and switch to RTL and LTR language to
check layout
Change-Id: I5f22b8853d036f22a2e66a6144660950c268d89b
2021-05-19 09:23:14 +00:00
Weng Su
99d8fcfae2 [Provider model] Revise the Internet Panel title sub-text
- Display "Tap a network to connect" on sub-title when Wi-Fi networks is
not empty

- Screenshot:
  https://screenshot.googleplex.com/5TzpJDLghpCQnDP

Bug: 188594439
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I0e3f0eb269fb4fe040a62be9ee84105879af82f7
2021-05-19 15:35:41 +08:00
Jason Chiu
817fb55032 Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev am: 9f24967458
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622863

Change-Id: Idbe15167ca0f5dafe886af8b7fca6a8d49a960e5
2021-05-19 07:21:20 +00:00
Jason Chiu
9f24967458 Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev 2021-05-19 07:03:17 +00:00
Yi Jiang
f1a04d7284 Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev am: 07532443ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14629551

Change-Id: I0d1a3aeb5fc2494af81dec11f9b50395e2b5dd57
2021-05-19 06:50:59 +00:00
Peiyong Lin
4e4a7f0dbd Merge "Add Game settings support." into sc-dev am: d32d11248e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14553339

Change-Id: Id122a4cd8356f8ee735df146a1631238e81178c5
2021-05-19 06:49:45 +00:00
Yi Jiang
07532443ca Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev 2021-05-19 06:10:03 +00:00
Peiyong Lin
d32d11248e Merge "Add Game settings support." into sc-dev 2021-05-19 05:42:14 +00:00
Jason Chiu
728081f9bb Fix NullPointerException at VolumeSliceHelper
Race condition happens on accessing a map while system is destroying it.

Test: manual, robotest
Fixes: 188114877
Change-Id: I245121b95d1d4db02e3107a47c6d3ae13a5d32e5
2021-05-19 13:19:55 +08:00
Suprabh Shukla
63fd87a13a Setting result earlier than onPause
Setting the result in onPause is too late for delivering it to the
requesting activity. Changing to setting the result any time the
uncommitted state is written. The state will still be committed in
onPause only.

Test: Manually with a test app using startActivityForResult.

Bug: 188477366
Change-Id: I676c99e7d2a64b644cef60ecd14728d4d49180c3
2021-05-18 22:13:47 -07:00