TreeHugger Robot
81aaadca0e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326566
Change-Id: I3ae76a9806d39de81adc2d7e127651f7f39dd735
2021-04-27 16:04:18 +00:00
TreeHugger Robot
8d58c02b06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326567
Change-Id: I1c87402a98bc9642b5b555c66aee6f423b84e9ff
2021-04-27 16:04:08 +00:00
TreeHugger Robot
c430db5ca3
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-27 15:55:21 +00:00
TreeHugger Robot
697411518c
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-27 15:50:33 +00:00
TreeHugger Robot
4fd6557446
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-27 15:48:51 +00:00
TreeHugger Robot
f69ba03181
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-27 15:47:01 +00:00
TreeHugger Robot
a2a94ad379
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-27 15:42:58 +00:00
Alex Johnston
a942f3fdd1
Correct string ConfirmDeviceCredentialActivity
...
* If there is a managed profile but a separate
profile challenge is not enabled, use the device
title and subtitle in ConfirmDeviceCredentialActivity.
Manual testing
* Set device PIN
* Create a work profile using TestDPC
* adb shell am start --user 10 -a android.app.action.CONFIRM_DEVICE_CREDENTIAL
* Verify title says 'Enter your device...'
* Add a work profile PIN
* adb shell am start --user 10 -a android.app.action.CONFIRM_DEVICE_CREDENTIAL
* Verify title says 'Enter your work...'
* Do the same for pattern and password
Bug: 163108636
Test: manual testing
Change-Id: I8b61e7d2df5792cbdb2e12b19e5a5582ea2290b7
2021-04-27 16:35:42 +01:00
Tsung-Mao Fang
744dd99af4
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 am: 59463e3e04 -s ours
...
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: Ia128429dadf68a8276eff806ee0e0eabad088913
2021-04-27 13:28:36 +00:00
Tsung-Mao Fang
78de74aa57
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 92d5e58003 -s ours
...
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 0bf3c98b2f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I1bf9360219cdc326571ffc9604a42792dcc31aba
2021-04-27 13:12:34 +00:00
Tsung-Mao Fang
59463e3e04
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: If58e759bcef83da086ded4366ac60647653d62cc
2021-04-27 13:11:26 +00:00
Tsung-Mao Fang
92d5e58003
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: If97943cb25cbbe5388a9b5d28faa50b4df156aad
2021-04-27 12:55:29 +00:00
Tsung-Mao Fang
9d5a7aa322
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I64550f7d57fd8c4cd2a142188ed78e9bb49f1c9f
2021-04-27 12:54:02 +00:00
Tsung-Mao Fang
f470b78ff2
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I4dd08163fb97a16c88aa23bdc39851b327034940
2021-04-27 12:30:50 +00:00
Tsung-Mao Fang
6ac45a7ceb
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I80b527b2bb891b3944a11ceecf296fdefaefff72
2021-04-27 12:15:53 +00:00
Bill Yi
0dfde85685
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie67bcfcb0c86013aae724ff562709f8c11a8796b
2021-04-27 11:48:42 +00:00
Bill Yi
73e1e602f3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia451dd13495fb8921ec6c86e1351802e94d078d4
2021-04-27 11:41:02 +00:00
Bill Yi
1296c998dc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifb1673ddffb724df5b7a587e9dd9a761b9820b3b
2021-04-27 11:36:37 +00:00
Bill Yi
abedd5d55a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8a23676662f760eca22337c8cee2b1df7b348ccc
2021-04-27 11:33:06 +00:00
Bill Yi
4012b44f4f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I829f3d222f9d37b06d9d6f3408f0f67297162a76
2021-04-27 11:30:15 +00:00
Bill Yi
02a535e27d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f604c21a5a6dc46c093cab5eadd178e5b931837
2021-04-27 11:26:41 +00:00
Tsung-Mao Fang
4470faa175
Tweak spacing for private DNS mode dialog
...
Test: See the screen
Fix: 186499972
Change-Id: Iaae7d625ef2931b9ba22e6edbd414ebe14cfdc3f
2021-04-27 17:59:01 +08:00
YUKAI HUNG
95b5d0393d
Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev
2021-04-27 09:19:17 +00:00
Peter_Liang
50efd602b9
Update the BC style for the vision settings in SuW.
...
Bug: 179234608
Test: manual test
Change-Id: I152eaab8ad77c7a1fccbc82d7ed8cef406fc1821
2021-04-27 16:29:56 +08:00
Jeremy Goldman
f1ee6987e6
Merge "Combine 5G and recommended strings" into sc-dev
2021-04-27 07:41:45 +00:00
ykhung
2f441d2a3e
Draw timestamp information into BatteryChartView manually (1/2)
...
screenshot: https://screenshot.googleplex.com/8zJcMJeMDovfhdD
Bug: 183921876
Test: make SettingsRoboTests
Change-Id: Ib4ac21ba2d12a6cb65b46ba3f1023fe9f14c539b
2021-04-27 07:25:53 +00:00
Yanting Yang
72ba46a9bb
Merge "Update homepage icon for Wallpaper & style" into sc-dev
2021-04-27 07:04:40 +00:00
Lucas Lin
614f653aeb
Merge "Use [set|get]PrivateDnsMode directly" into sc-dev
2021-04-27 06:03:14 +00:00
Joy Babafemi
4b19eae08b
Merge "Update UWB toggle state with a getter API" into sc-dev
2021-04-27 05:10:52 +00:00
Joy Babafemi
7cf391dddd
Update UWB toggle state with a getter API
...
Also updates capitalization for strings
Test: Manual on Raven & Robotest
Bug: 183254940
Change-Id: I9d3a4694746b44e80c60a9097abd0cbb647c1348
2021-04-27 03:46:39 +00:00
Yanting Yang
243956834d
Update homepage icon for Wallpaper & style
...
Bug: 185334720
Bug: 178363516
Test: visual
Change-Id: Iebc213be301e157a10299ff611817e8b03704c8a
2021-04-27 03:07:15 +00:00
Yanting Yang
db74d13d4f
Merge "Update string for the wallpaper title on homepage" into sc-dev
2021-04-27 03:05:18 +00:00
Dmitri Plotnikov
dd9c9a8c17
Merge "Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants" into sc-dev
2021-04-26 22:44:26 +00:00
Evan Chen
e14cc634dc
Merge "Companion Device App showing in Settings" into sc-dev
2021-04-26 18:22:02 +00:00
Edgar Wang
c603e02d11
Merge "Remove divider in Date & Time Settings" into sc-dev
2021-04-26 16:15:55 +00:00
TreeHugger Robot
42e05a07b5
Merge "Tweak title in privacy page" into sc-dev
2021-04-26 13:54:51 +00:00
Edgar Wang
4f3ee93285
Remove divider in Date & Time Settings
...
- Add preferenceCategory for Time zone
Fixes: 183578528
Test: robotest & visual
Change-Id: If275c569d810a8bc4d2e2620c51b54379dca31b4
2021-04-26 20:50:23 +08:00
Tsung-Mao Fang
9142869526
Tweak title in privacy page
...
There's an item under Settings > Privacy called "Privacy".
The strings should not be repeating the page title.
Test: see screen
Fix: 186131466
Change-Id: If60cbabd163e8168b02a63a96c82d93ad6ee3c8d
2021-04-26 20:31:01 +08:00
YUKAI HUNG
f634831de7
Merge "Draw percentage information into BatteryChartView manually" into sc-dev
2021-04-26 11:59:19 +00:00
Yanting Yang
2713eaaddc
Update string for the wallpaper title on homepage
...
Bug: 185334720
Test: visual
Change-Id: I17d7050e63ed8ec5c3eba98b96b1151dbe4b3bdd
2021-04-26 10:03:29 +00:00
PETER LIANG
921c677320
Merge "Fix the GAR issue of TalkBack said "double-tap to activate" on the slider title of Accessibility button page." into sc-dev
2021-04-26 08:00:28 +00:00
ykhung
1001614b14
Draw percentage information into BatteryChartView manually
...
screen: https://screenshot.googleplex.com/Bw4Whpzff5pCT5J
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I61c0f73e27dc2980d0812e00c2fdfda9a628b696
2021-04-26 07:53:49 +00:00
TreeHugger Robot
5f876de174
Merge "Show security screen for ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" into sc-dev
2021-04-26 07:16:02 +00:00
TreeHugger Robot
e39066c388
Merge "Make app usage page support legacy version" into sc-dev
2021-04-26 06:34:28 +00:00
Betty Chang
75d6293a50
Merge "Add TextWatcher for the ip config field" into sc-dev
2021-04-26 06:17:56 +00:00
Wesley.CW Wang
d67f878c67
Make app usage page support legacy version
...
- Add a flag to divide legacy and new design
- Add new layout for tristate design
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I61f694cad8ac9cea8195191feacbe80bac2df62e
2021-04-26 13:18:33 +08:00
jasonwshsu
9b284a9af1
Wrap a white adaptive background if it is not an AdaptiveIcon
...
Bug: 183501919
Test: manual test
Change-Id: I6a899aa0fcb724d5318274190f359080fc2d0615
2021-04-26 05:01:00 +00:00
changbetty
244268b98d
Add TextWatcher for the ip config field
...
[Root Cause]
We always check the valid for the ip config field. If the text is empty
we will set the default for user even if user deleted the values.
[Solution]
Add TextWatcher for the ip config field (include gateway/network prefix
length/dns1). If the text change and the text is empty, we will set the
hint for user, not the default.
Bug: 179331339
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2
Change-Id: I1976200c70ae768285a44aff5df54ced00a78171
2021-04-26 12:53:08 +08:00
Hugh Chen
c2adcb2d3a
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 )
2021-04-26 03:45:59 +00:00
Hugh Chen
093ac45cd8
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 )
2021-04-26 03:45:01 +00:00