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

22948 Commits

Author SHA1 Message Date
Sally Yuen
6a7eb6e47f 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: I5a550926f200025d66b364a49622cb607abc4589
 2021-04-21 16:23:30 +00:00
Julia Reynolds
c258da5c1d 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: Ica558f736109f99fadfb60d4fd58812148bf597a
 2021-04-21 16:23:01 +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
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
4bb02f3a03 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: I5265baab866a2f68b90d620a03a2d92e0195b133
 2021-04-21 14:44:58 +00:00
YUKAI HUNG
c6c3b383da Merge "Add new expandable preference component" into sc-dev 2021-04-21 14:20:26 +00:00
TreeHugger Robot
bd2b2cfdc1 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: I3bd7071e577a02b36d44274b49832329b57149fb
 2021-04-21 13:33:07 +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
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
8310786aef 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: I87db94c693686b479a62f9375f54feb54bf4a031
 2021-04-21 11:38:20 +00:00
Matt Pietal
ee2086872e Merge "Remove "Device Controls" from Settings" into sc-dev 2021-04-21 11:31:33 +00:00
Arc Wang
5c04e61041 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: I7e3f5582415be347cc7dae0670a2d28bccc8ebf1
 2021-04-21 09:16:54 +00:00
Arc Wang
3486b95fd7 Merge "Update progress bar UI" into sc-dev 2021-04-21 09:01:35 +00:00
Alex Johnston
a2a6b527f9 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: I3abd517eb830a52845c8a8b90340d66808b84db1
 2021-04-21 08:53:08 +00:00
Alex Johnston
4a4e2bae61 Merge "RequestManageCredentials dark theme" into sc-dev 2021-04-21 08:45:06 +00:00
TreeHugger Robot
573b99328d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-21 08:39:44 +00:00
TreeHugger Robot
2213fafc13 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-21 08:39:25 +00:00
TreeHugger Robot
d42ace8ba2 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: I369883434d2f25d0e253fcee30c63cf2c036512d
 2021-04-21 08:39:13 +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
b4dc53eca4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9dd3eea4d1ff8b8a01faa9e0fd423d1396bdc81b
 2021-04-21 07:21:17 +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
Bill Yi
85e0230606 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe0aedbb3e96ae2445984c1d8a5bea20e05ef218
 2021-04-21 07:16:02 +00:00
Menghan Li
e09ee20829 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: I38f91dac5b3f6fbb41513aec61f93aa7ac3e2e80
 2021-04-21 06:03:27 +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
c46eb4a4e9 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: I2238367cb0e06257c2bc57710004317ccf79e16e
 2021-04-20 21:38:47 +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
2086763cc4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-20 20:16:11 +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
d99fc49551 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-20 19:54:06 +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
d086ba103f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie0992b4d1bdd52c7ba17f56bd231eb49786a44c2
 2021-04-20 18:38:43 +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
Bill Yi
807cbea464 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I33b5a68e3f3988de42436daffaecbab0a041be0c
 2021-04-20 18:33:22 +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
ykhung
619bafa1e0 Add footer for battery usage page am: 1415cbc49a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235152

Change-Id: Iff31e82abf8af8bb2930109df2e82280d3a7b10d
 2021-04-20 16:50:05 +00:00
ykhung
e16407940f 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: Ic2b6cf16aa8daacf7c2bb7f5a63ee84e380f0684
 2021-04-20 16:50:01 +00: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
6f611ae04b 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: Iaef5978ae72b83a948c2716512798fd3a5b4e5e2
 2021-04-20 14:47:18 +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
Arc Wang
5383f11ec9 Update progress bar UI 
Apply android:progressDrawable to Settings theme,
the drawable shows round corners and different colors.

Bug: 174964885
Test: manual visual
Change-Id: I0447231200d12953f4527866d537ee605009f8a4
 2021-04-20 20:31:30 +08:00
Wesley Wang
ab3b726add 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: Ibc9fcec23299a5f177a118848a6f6054a3ff5df7
 2021-04-20 12:31:22 +00:00