PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,095 Commits 1 Branch 0 Tags
8bdddf8ba4e5a76a1e44422d04c85f1be8e2fb8f
Commit Graph

81095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Wesley.CW Wang
e9cfef7ace Update battery settings relative strings (2/3) 
Bug: 183689347
Test: make
Change-Id: I11524a8bf6d929faa4e5f51581600b12916e3c46
 2021-04-01 02:10:54 +00:00
Bill Lin
e3e3fc915a Merge "2/ Make One handed mode support multiple user switch" into sc-dev 2021-04-01 02:02:39 +00:00
Bonian Chen
02fc12a796 [automerger skipped] Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325 am: 5735be835c -s ours 
am skip reason: skipped by user bonianchen

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I2204d4f9d87decdb34160a75b895f143fffc3882
 2021-04-01 01:56:32 +00:00
Ahaan Ugale
cccaf43f2a Merge "Fix passwords settings crash due to null lifecycle owner." into sc-dev am: 3afa988e1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13988607

Change-Id: Ifc1f436f389586d5c155d7e109521fee9ab902e9
 2021-04-01 00:26:27 +00:00
Ahaan Ugale
3afa988e1e Merge "Fix passwords settings crash due to null lifecycle owner." into sc-dev 2021-03-31 23:42:10 +00:00
TreeHugger Robot
73961cf510 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46b5695031 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14054530

Change-Id: I6290aaafcbd76c6cb3008b9b2cf27beacb6831ec
 2021-03-31 22:41:51 +00:00
TreeHugger Robot
c988d01854 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bb799e3144 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14054531

Change-Id: If069d4ee4022266cc20152875c64a4c67a805003
 2021-03-31 22:40:25 +00:00
TreeHugger Robot
46b5695031 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-31 22:35:24 +00:00
TreeHugger Robot
bb799e3144 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-31 22:25:34 +00:00
Yu-Han Yang
34980d9314 Merge "Update Location Settings footer when MLS changes" into sc-dev am: 844347bd27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14036910

Change-Id: Ic9628e6bf86146912db634a00edb749cc63058be
 2021-03-31 22:12:37 +00:00
Yu-Han Yang
844347bd27 Merge "Update Location Settings footer when MLS changes" into sc-dev 2021-03-31 21:38:29 +00:00
Yu-Han Yang
4b2e6f76ff Update Location Settings footer when MLS changes 
Also changed strings:
- from "Manage location permissions" to "App location permissions"
- from "Location Services" to "manage location services"

Bug: 180533061
Test: on device
Change-Id: I135430674b9363ea7caaa44f6e9baed96b6ec3cf
 2021-03-31 13:15:36 -07:00
Bill Yi
5d5f583dc8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I178674550fc86cf77ac47ee88e36a0903bb2caff
 2021-03-31 19:52:15 +00:00
Bill Yi
29f8151d1e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id2e9d44d1f15a657d7e1651aca6e04d9d3586682
 2021-03-31 19:19:40 +00:00
Wesley.CW Wang
f97a5e8fc1 Update battery progress bar am: fdfda5e589 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045496

Change-Id: I008cdd00eb1c607c61cacd7aab037426dd83de1d
 2021-03-31 17:31:30 +00:00
Wesley.CW Wang
fdfda5e589 Update battery progress bar 
- Setup state text to bottom text view
 - Remove battery state icon
 Screenshot: https://screenshot.googleplex.com/At9tAVDgnoQBtNS.png

Bug: 177407113
Test: make RunSettingsRoboTests
Change-Id: I86cfe83982da70b8fc49386f388c1a068295e205
 2021-03-31 17:04:24 +00:00
Bonian Chen
5735be835c Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I6100fa84ad5be8d33bd20d9836ecd432a217fe7a
 2021-03-31 15:44:41 +00:00
Jernej Virag
3340db9ef0 Fix error in PowerMenuSettingsControllerTest am: 512419a454 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051305

Change-Id: If708b4979129e426158151bb665354724f54586c
 2021-03-31 15:43:54 +00:00
Pavel Grafov
16d588c11a 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 ROBOTEST_FILTER=com.android.settings.vpn2
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
 2021-03-31 15:20:11 +00:00
Bonian Chen
a472f53325 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I0330a149d0b686e8acee05a5028f67e1cb7ad3a6
 2021-03-31 15:03:38 +00:00