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

22859 Commits

Author SHA1 Message Date
Neil Fuller
297ba96a01 Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331

Change-Id: Ief6368326813f6e444675ce0ff19ba35b3e0ff93
 2021-04-21 20:01:40 +00:00
Neil Fuller
33aa65b3cc Merge "Remove restriction for "Use location..."" into sc-dev 2021-04-21 19:54:41 +00:00
Chloris Kuo
61bb91658f NAS setting onboarding string change 
Bug: 185112379
Bug: 185535840
Test: manual test on device
Change-Id: Ieb7ea74398ac333b4adc722ea54b30b9f89d02a1
 2021-04-21 12:15:52 -07:00
TreeHugger Robot
ffb9e456d3 Merge "Notif history styling updates" into sc-dev am: b768489fa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266709

Change-Id: Ie0ee54c030626845189e05ca4e8268450edf83eb
 2021-04-21 17:19:25 +00:00
TreeHugger Robot
b768489fa0 Merge "Notif history styling updates" into sc-dev 2021-04-21 16:46:31 +00:00
Sally Yuen
8a495fd55c Merge "Add extra dim keywords to aosp settings" into sc-dev am: 790d69d465 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252125

Change-Id: I59b5bcb68a725ad69a48dbd8088db7f02d5f850e
 2021-04-21 16:25:30 +00:00
Julia Reynolds
b1dda2487f Merge "Use a new string for category headers" into sc-dev am: 5770b4e928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265928

Change-Id: I9bb8705b59e20e3fd49dda97ad345c72e3fcad5b
 2021-04-21 16:25:04 +00:00
Sally Yuen
790d69d465 Merge "Add extra dim keywords to aosp settings" into sc-dev 2021-04-21 16:13:46 +00:00
Julia Reynolds
5770b4e928 Merge "Use a new string for category headers" into sc-dev 2021-04-21 16:10:22 +00:00
Julia Reynolds
e8a33e0c83 Notif history styling updates 
Test: manual
Fixes: 185625272
Change-Id: Ie9d62573b2c6480b84ab9172beccf519e7e880dc
 2021-04-21 10:55:51 -04:00
Julia Reynolds
60ded30669 Use a new string for category headers 
The existing string refers to singular objects, but we need
to refer to several

Test: manual
Fixes: 185325146
Change-Id: Ie22fa7a8c1857558baceb05d8ca80cfd6ff61ed4
 2021-04-21 14:48:31 +00:00
YUKAI HUNG
038ea6c4cb Merge "Add new expandable preference component" into sc-dev am: c6c3b383da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260595

Change-Id: If2f78cfb89edee1613b3a5de51c311ff521b8bd2
 2021-04-21 14:47:03 +00:00
YUKAI HUNG
c6c3b383da Merge "Add new expandable preference component" into sc-dev 2021-04-21 14:20:26 +00:00
Peter_Liang
d2658b57d8 Fix the entire text is aligned middle of the Vision setting screen. 
Root cause:
The preferenceStyle attribute was overridden in the PreferenceTheme.SetupWizard style.

Solution:
Remove the overriden preferenceStyle.

Bug: 183086481
Test: manual test
Change-Id: I60d127baef9274170a31eaf3cfbd210312334311
 2021-04-21 22:08:45 +08:00
TreeHugger Robot
b4678cd9a0 Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev am: 7f065adfcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255423

Change-Id: If40e4d2476825477f949a919ca106b63af9da571
 2021-04-21 13:34:58 +00:00
TreeHugger Robot
7f065adfcb Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev 2021-04-21 13:06:45 +00:00
Wesley.CW Wang
2cc7431fa3 Update app usage page active time format 
- Make the text of active time support different states like foreground or background usage time less than one minutes

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I20be88e5b23a679c15f97bac4b9d400557685463
 2021-04-21 20:20:05 +08:00
ykhung
b8721cf980 Add new expandable preference component 
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id2b2a1f4fa557467efcaa013aa9e978b2c66d974
 2021-04-21 11:58:45 +00:00
Matt Pietal
aa0062c92f Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389

Change-Id: I8936eee6221fc6090e1cf1ee185c1cd0214f5d96
 2021-04-21 11:40:12 +00:00
Matt Pietal
ee2086872e Merge "Remove "Device Controls" from Settings" into sc-dev 2021-04-21 11:31:33 +00:00
Arc Wang
6e3d7e7236 Merge "Update progress bar UI" into sc-dev am: 3486b95fd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235149

Change-Id: Ibf6f427ebefb98bccc8bfc22e0c3cd580c2d9465
 2021-04-21 09:06:18 +00:00
Arc Wang
3486b95fd7 Merge "Update progress bar UI" into sc-dev 2021-04-21 09:01:35 +00:00
Alex Johnston
7f56d09993 Merge "RequestManageCredentials dark theme" into sc-dev am: 4a4e2bae61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14011458

Change-Id: I5a2335e66ae74a608b20e41729a2790f7f2444cf
 2021-04-21 08:54:50 +00:00
Alex Johnston
4a4e2bae61 Merge "RequestManageCredentials dark theme" into sc-dev 2021-04-21 08:45:06 +00:00
TreeHugger Robot
513c0a1d1c Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev am: d4a4fead67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236566

Change-Id: I18bc1abe24d6fb67772770bc473e796a9fed0c19
 2021-04-21 08:41:33 +00:00
TreeHugger Robot
73a806fa37 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-21 08:25:07 +00:00
TreeHugger Robot
6d25cfcc3b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-21 08:25:04 +00:00
TreeHugger Robot
d4a4fead67 Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev 2021-04-21 08:19:13 +00:00
Bill Yi
1d413d8390 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic67b0bfa2e86c32e2084d36459916aae031f97ed
 2021-04-21 07:25:12 +00:00
Bill Yi
18bbddbc72 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I179f0d31dcca4db83624ecd31c0d88fc24a93559
 2021-04-21 07:17:44 +00:00
Menghan Li
5385c6bc66 Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev am: d3cc241c42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255410

Change-Id: Ic53f93e9a3493ce1ddc2bb5696fdd8a5fdeac140
 2021-04-21 06:05:26 +00:00
Sunny Shao
c361e3426f Fix background inconsistency of the Settings page in SUW 
- Pass the extra arguments to target page from vision settings.
- Add the android:colorBackground to LightTheme.SubSettings.SetupWizard.

Fixes: 185873105
Bug: 184901818
Test: manual test
Change-Id: I063a8df875b727aa0e119b03dfb782c2b95dc1b5
 2021-04-21 13:35:45 +08:00
menghanli
b4558c9607 [Material Next] Update main feature switch for Caption preferences. 
Fix: 185950803
Test: manual test
Change-Id: I5431461f3088652ddff7400b24b3eea25ddf5f9a
 2021-04-21 11:39:56 +08:00
TreeHugger Robot
a0501be2b0 Merge "Fix search index for a financed device" into sc-dev am: db3767e7b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14163911

Change-Id: I217da001caa9f904a25d25e031ec06c5f5156e1c
 2021-04-20 21:40:18 +00:00
TreeHugger Robot
db3767e7b3 Merge "Fix search index for a financed device" into sc-dev 2021-04-20 21:06:45 +00:00
TreeHugger Robot
33583e7990 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-20 20:04:02 +00:00
TreeHugger Robot
f988d7688b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-20 19:46:16 +00:00
Salud Lemus
9068481299 Fix search index for a financed device 
Now with two preference controllers, one for enterprise device and one
for financed device, the search index issue (querying "Financed device
info" in Settings does not show a search result) is fixed. The financed
preference controller is used when the device is a financed device.
Otherwise, the enterprise preference controller is used.

Bug: 183551684
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=FinancedPrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacyPreferenceControllerHelperTest

Change-Id: I051144ec9004f86456285078ebb1c72266f80a55
 2021-04-20 12:17:39 -07:00
Bill Yi
1d6b60889e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7f73237f7a7fcef3389c3afebadcafdb0be4d60c
 2021-04-20 18:42:47 +00:00
Bill Yi
bf0d0fe30e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I02e17fc7d05452a591f4df992135821a4d8524cc
 2021-04-20 18:35:03 +00:00
Neil Fuller
26d094b4a3 Remove restriction for "Use location..." 
Remove restriction for "Use location to set time zone" toggle.

This setting should not be restricted. Using location is a personal
choice since it involves the use of the device's location.

Bug: 166579161
Test: manual testing with / without date/time restriction
Change-Id: I89973e1df5cad8b4c639c13478298f9b39f37b5f
 2021-04-20 18:30:05 +01:00
ykhung
a04ecb0e91 Add footer for battery usage page am: 1415cbc49a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235152

Change-Id: I217d8ca631713c146024146025845205cf24fd23
 2021-04-20 16:53:04 +00:00
ykhung
945c3271dd Add battery usage time summary to usage list item am: 7cc616e90f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233636

Change-Id: Id407b1b81a184f6c51e099ce906f38336e01f671
 2021-04-20 16:53:03 +00:00
sallyyuen
d95f92839e Add extra dim keywords to aosp settings 
Test: na
Bug: 170973645
Change-Id: I9cbb1b4245f4f656137c076c385bc1e404f8ed55
 2021-04-20 09:51:51 -07:00
Alex Johnston
dce68bf7a5 RequestManageCredentials dark theme 
Manual testing steps
* Enable dark theme via Settings > display
* Install TestDPC and select 'Request to manage credentials'
* Verify dark theme is displayed (including light text)

Bug: 177901172
Test: atest com.android.settings.security.RequestManageCredentialsTest
      manual testing
Change-Id: I6db1361ffcbf1e193673eb5ca7ef3f403d5023b1
 2021-04-20 15:21:14 +00:00
TreeHugger Robot
2bff5d8627 Merge "Clean up app usage page" into sc-dev am: a30178221a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14250085

Change-Id: I7ff9d754f310ddd72f9603da764aa74502d2d2d5
 2021-04-20 14:48:39 +00:00
ykhung
1415cbc49a Add footer for battery usage page 
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ic61c32f22fe962e4afa3db23b867d1acd2702f65
 2021-04-20 14:41:12 +00:00
ykhung
7cc616e90f Add battery usage time summary to usage list item 
Insert app foregound and background usage time information into the
preference item summary based on the different scenarios.

Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I13ba357666adfb7b57f52ffae18d09aed8dd0773
 2021-04-20 14:35:27 +00:00
TreeHugger Robot
a30178221a Merge "Clean up app usage page" into sc-dev 2021-04-20 14:30:22 +00:00
Wesley Wang
8bc189e31d Merge "Update app usage page active time column" into sc-dev am: 386d4ba8a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233627

Change-Id: I3db18a28e7a6b949d4e633b5575c42962e60e1ca
 2021-04-20 12:33:29 +00:00