PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,375 Commits 1 Branch 0 Tags
dd98b472550b34d4780f2a4768fbc9917460256a
Commit Graph

82375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsung-Mao Fang
2f24ae2f5b Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe am: d80c5bba40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I4e82a29bba6442681172a99074e11e2f4d231f4f
 2021-04-01 17:08:43 +00:00
Hai Shalom
57ab802758 Merge "Settings: Rename OCSP Do not validate option" into sc-dev am: b7dd5e5857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14061105

Change-Id: Icac9daa3a6a67cec489d8c0fe1827d355c0bfafb
 2021-04-01 17:03:50 +00:00
Hai Shalom
b7dd5e5857 Merge "Settings: Rename OCSP Do not validate option" into sc-dev 2021-04-01 16:24:38 +00:00
TreeHugger Robot
d86780ddc1 Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060694

Change-Id: I57dda339fa89ea790092b24c71a2ac2f0c443fdc
 2021-04-01 16:24:07 +00:00
Tsung-Mao Fang
d80c5bba40 Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I0312dc7bf253ef50a89848ae9879646200282e66
 2021-04-01 16:23:51 +00:00
TreeHugger Robot
9258e9ee9d Merge "Only display single line for title" into rvc-qpr-dev 2021-04-01 16:18:08 +00:00
Beth Thibodeau
f0f14c4f25 Merge "Update style of main media setting toggle" into sc-dev am: 6812256031 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13998846

Change-Id: I45c37b9cccdc462d3ea94486a09f24e7255102d1
 2021-04-01 16:05:09 +00:00
Jason Hsu
fc4ab252c6 Merge "Remove unused code" into sc-dev am: 4e95be4aa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060696

Change-Id: Iadf9860b096741754f32859e51d4949f9b18a13a
 2021-04-01 16:04:58 +00:00
Tsung-Mao Fang
bfb68fa6fe Merge "Revert "Only display single line for title"" into rvc-qpr-dev 2021-04-01 15:56:19 +00:00
Tsung-Mao Fang
e858691cfc Attempt to fix IllegalArgumentException from RecyclerView 
From the log, the crash happens while RecyclerView is doing
animation stuff. In Settings case, we didn't use any animation
in the list, so the simplest solution is to disable the ItemAnimator
completely.

Test: Check if origin listview behavior is affected.
There's no crash after user comes back from subpage.
Fix: 184214085

Change-Id: If0988cb8e036ce5af1b8d2aa0d4ab77effd476e2
 2021-04-01 23:54:49 +08:00
Beth Thibodeau
6812256031 Merge "Update style of main media setting toggle" into sc-dev 2021-04-01 15:47:07 +00:00
Jason Hsu
4e95be4aa2 Merge "Remove unused code" into sc-dev 2021-04-01 15:27:21 +00:00
Pavel Grafov
8bdddf8ba4 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp am: efab095931 am: 69022ccc3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051306

Change-Id: I02869fbbff2a04b2b67769c731b75d4e9f85d968
 2021-04-01 15:02:27 +00:00
Wesley.CW Wang
7366d71702 Fix BatteryInfo test fail 
- rollback part of ag/14063746

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I11129713dac2584c54890f65af53ce76b0672b8d
 2021-04-01 14:31:14 +00:00
Pavel Grafov
69022ccc3a Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp am: efab095931 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051306

Change-Id: Iaa80f44026f969706701bfc6a4aa4317b1a8acf2
 2021-04-01 14:24:46 +00:00
tim peng
8e6583cf69 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev am: 6f96226f45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045485

Change-Id: Ib71bad87161501a98eec50ca3cbe12544f0c68c5
 2021-04-01 14:00:28 +00:00
Pavel Grafov
efab095931 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp 2021-04-01 13:49:32 +00:00
Tim Peng
93ee8efe94 BTHS will have no sound after disable HD audio 
-setCodecConfigPreference() should not be called when disableOptionalCodecs() is called.
-disableOptionalCodecs() would set SBC codec automatically

Bug: 183456866
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothCodecDialogPreferenceControllerTest
Change-Id: Ib18f4a683dcba7ba92df827c30da0088c90b4d72
 2021-04-01 21:38:00 +08:00
tim peng
6f96226f45 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev 2021-04-01 13:25:31 +00:00
Wesley Wang
7fbf2baf49 Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev am: e949d0f870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063746

Change-Id: Ida57003f03a40fe813f299903b39502a5945f7d2
 2021-04-01 12:14:23 +00:00
Pavel Grafov
735a216da3 Prevent disconnecting admin-configured VPN 
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.

Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j
Merged-In: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
 2021-04-01 12:39:32 +01:00
Wesley Wang
e949d0f870 Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev 2021-04-01 11:30:22 +00:00
Wesley.CW Wang
d7e0fa959b Fix testing fail for BatteryInfoTest and HighUsageTipTest 
- Fix the test fail from ag/14048547

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: Ia7a0d0fa567b1826a42b304a04e627e3b0e5f896
 2021-04-01 18:28:14 +08:00
Jason Hsu
5dc2efe572 Merge "Update accessibility settings layout" into sc-dev am: 849055967f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056751

Change-Id: I9157244ff9b733ffd14053a80994b3c04b9bb380
 2021-04-01 10:20:22 +00:00
Ivan Chiang
a4788bdc81 Update the strings for Media Management Apps 
Bug: 184102095
Test: manual, screenshot
Change-Id: I0be92b600bc45fd805c01e6be5db39df40976ead
 2021-04-01 18:03:24 +08:00
jasonwshsu
6e33293fa3 Remove unused code 
* isColorTransformAccelerated() already moved to ColorDisplayManager
* TurnScreenDarker fragment already moved to top level accessibility settings or TextAndDisplay fragment

Bug: 174829936
Test: manual test
Change-Id: I34ec6947129a5042d573e94eabe3c24c2fe761b5
 2021-04-01 09:41:11 +00:00
Jason Hsu
849055967f Merge "Update accessibility settings layout" into sc-dev 2021-04-01 09:40:32 +00:00
Jeremy Goldman
5ef363aadd Merge "Revert "Unit tests for the VpnInfoPreference."" 2021-04-01 08:26:25 +00:00
Tsung-Mao Fang
10246383a0 Merge "Only display single line for title" into sc-dev am: 6d0ed92049 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060693

Change-Id: I4f8023f23e0561bee0afcc8688db173caa3c70fa
 2021-04-01 07:59:35 +00:00
Tsung-Mao Fang
6d0ed92049 Merge "Only display single line for title" into sc-dev 2021-04-01 07:41:55 +00:00
Tim Peng
7246a4f842 [Rohan]The battery level show up "-1%", not sync with Rohan. 
-Hide battery information when it is unknown

Bug: 184017556
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I5f94ccae364f1420e04af21ba425c29ac6a11dd2
 2021-04-01 15:40:54 +08:00
YUKAI HUNG
99e05960b8 Merge "Fix testing fail for BatteryEntryTest from patch ag/14008232" into sc-dev am: 971dc476c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060695

Change-Id: I9934802a429341758faf141d2c57d1a9f749da61
 2021-04-01 07:36:59 +00:00
YUKAI HUNG
971dc476c3 Merge "Fix testing fail for BatteryEntryTest from patch ag/14008232" into sc-dev 2021-04-01 07:10:22 +00:00
Wesley.CW Wang
ce453159f7 Update low battery tips string am: 6d836d2d51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048550

Change-Id: I20ef817e4cd7bea00cc4ea6b74a35c7ea82022c6
 2021-04-01 06:52:53 +00:00
Wesley.CW Wang
6d836d2d51 Update low battery tips string 
- Screenshot: https://screenshot.googleplex.com/33zJkqsTex8r49W.png

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I864c555c3e500bf4ae5364db8dd6c86be564b883
 2021-04-01 06:30:08 +00:00
Hugh Chen
ebe6e7e5ea Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev am: cf2dc5107b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056750

Change-Id: Ic276e1f9f9db9eff9258f7501d03a66e41963745
 2021-04-01 06:05:47 +00:00
Tsung-Mao Fang
f7ae52bed6 Only display single line for title 
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e
 2021-04-01 05:48:04 +00:00
Tsung-Mao Fang
4f6caf2941 Only display single line for title 
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
 2021-04-01 13:45:24 +08:00
Hugh Chen
cf2dc5107b Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev 2021-04-01 05:40:21 +00:00
ykhung
1b8a100c7a Fix testing fail for BatteryEntryTest from patch ag/14008232 
Bug: 184138623
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Ic770b09cc303a9f213e31174f279940c2aa1f87d
 2021-04-01 13:40:11 +08:00
Jeremy Goldman
761b0f0b77 Revert "Unit tests for the VpnInfoPreference." 
This reverts commit 1e461619ab.

Bug: 183926662
Reason for revert: Quick fix to resolve broken test in production

Change-Id: Iadd655ed522c3c3c39109655183859e8b4875acd
 2021-04-01 04:53:01 +00:00
Yanting Yang
934fbb91a8 Merge "Add positive button into regulatory info dialog" into sc-dev am: 123422c99c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048549

Change-Id: I707dfce8e1dd57e9d89fa6096226732cc7f50870
 2021-04-01 04:16:22 +00:00
Tsung-Mao Fang
ba9215cbda Revert "Only display single line for title" 
This reverts commit 121041cf58.

Reason for revert: Some use cases don't need single line design. see b/184108687

Fix: 184108687
Change-Id: I1d095ae198cf2fd73eef39caf93895c7d96ca7f7
 2021-04-01 04:14:03 +00:00
Hai Shalom
f909a3d29e Settings: Rename OCSP Do not validate option 
Rename OCSP "Do not validate" option to "Do not verify".

Bug: 176863452
Test: compiles, verify new string
Change-Id: I806c29a711b674a9f5636ee84e55367fb6391ac8
 2021-03-31 21:11:47 -07:00
Wesley.CW Wang
79ce6650bc Update battery settings relative strings (2/3) am: e9cfef7ace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048547

Change-Id: Id40d818662fdf4fe878819151e751fb55cf22f65
 2021-04-01 03:56:41 +00:00
Yanting Yang
123422c99c Merge "Add positive button into regulatory info dialog" into sc-dev 2021-04-01 03:54:27 +00:00
Bill Lin
e43497ff54 Merge "2/ Make One handed mode support multiple user switch" into sc-dev am: e3e3fc915a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849836

Change-Id: I446caec4128640628d205babf4b5306c99a2eb90
 2021-04-01 02:37:25 +00:00
jasonwshsu
541e3334ae Update accessibility settings layout 
Accessibility settings category restructure
1. Bring back reduce bright color and dark ui mode to the top level

Bug: 174829936
Test: manual test
Change-Id: I733a9e115645bbe663bedd98fe0193cef840a0ee
 2021-04-01 10:35:47 +08:00
Bonian Chen
87e0ee06a6 [automerger skipped] Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325 am: 5735be835c -s ours am: 02fc12a796 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I47d2fa72d72aa0a52194354eb6bc0af23a96f7d7
 2021-04-01 02:35:07 +00:00
Hugh Chen
802cb176d0 Revert "Fix bluetooth settings will broadcast to anywhere when some cases" 
This reverts commit 9d00364da4.

Reason for revert: This fix have a regression, for not blocking b/183344112 revert it.

Change-Id: Ic4366b51e07b43c8d64d2e145563d8a30cb0fc60
 2021-04-01 02:24:51 +00:00