Commit Graph

13649 Commits

Author SHA1 Message Date
Jason Hsu
9f7549172e Merge "Fix accessibility settings page did not update the preference state" into sc-dev am: e8063609eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029862

Change-Id: Ide502e3d52249f7af468814420e5e20c6b6f488e
2021-04-21 03:04:31 +00:00
Jason Hsu
e8063609eb Merge "Fix accessibility settings page did not update the preference state" into sc-dev 2021-04-21 02:29:23 +00:00
Mady Mellor
303c4c8bc3 Merge "Change bubble settings to use Secure rather than Global" into sc-dev am: 2affde3202
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13474542

Change-Id: I28c394b68327bdf03be3e94bf963e7149d0477ad
2021-04-20 23:09:55 +00:00
Mady Mellor
2affde3202 Merge "Change bubble settings to use Secure rather than Global" into sc-dev 2021-04-20 23:06:40 +00: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
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
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
jasonwshsu
15df635dd6 Fix accessibility settings page did not update the preference state
Root Cause: Keys in ContentObserver registered after the keys change

Solution: Keys in ContentObserver need to be observed during the whole lifecycle to update the preferences including summary text

Fix: 183157677
Fix: 172469017
Fix: 183459237
Fix: 183459376
Test: atest AccessibilitySettingsTest
Change-Id: I3b22773965f1878c499a0f9cbd8bd0f3c9c6fae9
2021-04-20 23:13:23 +08: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
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
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
Wesley Wang
386d4ba8a9 Merge "Update app usage page active time column" into sc-dev 2021-04-20 11:58:55 +00:00
Wesley.CW Wang
72463703ac Clean up app usage page
- Remove unused reference

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Iecb9b14bba5e823c1ceee70d5a27c6fe74dab815
2021-04-20 18:08:25 +08:00
Wesley.CW Wang
f1966e9d0b Update app usage page active time column
Screenshot: https://screenshot.googleplex.com/5DYcV9fFTiatepi.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: If0427a4ed634a453ac49b35bd8082b8790ca7402
2021-04-20 13:49:57 +08:00
Chloris Kuo
504aebdbe3 Merge "NAS settings change" into sc-dev am: 7e9fe7b5c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14232928

Change-Id: If821e0cd34af2e85eb4fea7e161f761b1acde4d5
2021-04-20 02:40:17 +00:00
Chloris Kuo
7e9fe7b5c5 Merge "NAS settings change" into sc-dev 2021-04-20 02:03:27 +00:00
Mady Mellor
24adce034d Change bubble settings to use Secure rather than Global
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Bug: 173408780
Change-Id: I53fcd59c22c219551bd2eb6f0251acb5a03690ea
2021-04-20 01:37:34 +00:00
ykhung
b53ed32ed5 Refine startBatteryDetailPage method to support history data am: 4752ea17b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14231927

Change-Id: I3a64bc66cd48af0b57e4b6e2752cefb08c72969f
2021-04-19 16:01:47 +00:00
ykhung
4752ea17b9 Refine startBatteryDetailPage method to support history data
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iee3b6b353c4f92bdad37fac55adad58b4f205bf6
2021-04-19 14:06:55 +00:00
Wesley Wang
9fbb8e16d0 Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev am: e3cf049039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209651

Change-Id: I742dc967380c74f7c09b3346077217a9f9c49212
2021-04-19 10:32:00 +00:00
Wesley Wang
e3cf049039 Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev
* changes:
  Add footer to app usage page
  Update app usage page with 3 radio button control
  Add 3 controller for app usage page radio buttons
  Add utils class for app usage operation
2021-04-19 10:15:49 +00:00
Kholoud Mohamed
e4171ae2e1 Merge "Enable ignored test" into sc-dev am: 5fb1b61253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199608

Change-Id: Ia34822407f9711be22d9ec62de7154c8a65977d3
2021-04-19 08:56:42 +00:00
Kholoud Mohamed
5fb1b61253 Merge "Enable ignored test" into sc-dev 2021-04-19 08:34:47 +00:00
Wesley.CW Wang
8ca6f31716 Add footer to app usage page
- Add a footer to present the description text, will present specific text once this app is optimized or unrestricted only
 Screenshots:
   https://screenshot.googleplex.com/4HZGQU6SDni3PdR.png
   https://screenshot.googleplex.com/9gLSgftmaYuZepf.png
   https://screenshot.googleplex.com/55masP3VoAtAFMo.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Iced0fa591faf72874e2e3dff942122c90d35a4e7
2021-04-19 08:14:54 +00:00
Wesley.CW Wang
5083d82df7 Update app usage page with 3 radio button control
- Improve the UX from 2 different preference column to 3 radio button,
 make the restriction state more easy to control and recognize
 Screenshot: https://screenshot.googleplex.com/4nCBnF5FzwePqrL.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Ic354ac91e5496c0e44c5b44142627ac8a090e30f
2021-04-19 08:14:41 +00:00
Wesley.CW Wang
3db43de758 Add 3 controller for app usage page radio buttons
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I0b4cb6ca2db3c5f6dafd89484c91ca3f7fb1a1ae
2021-04-19 08:14:21 +00:00
Wesley.CW Wang
f2321ad5e1 Add utils class for app usage operation
- An util class to control usage state

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I9c1d37610a2e52d484228ef8e5c7af49e12f82aa
2021-04-19 16:13:00 +08:00
YUKAI HUNG
2c7e6c57bd Merge "Add app usage preferencee item into the history preference" into sc-dev am: 36e9a5ffd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230387

Change-Id: I02b9113d4352140a9171640835fc6ad1d6096d6c
2021-04-19 07:20:11 +00:00
Chloris Kuo
d37f0faf0d NAS settings change
Handle migration for multi-profiles

Test: make RunSettingsRoboTests
Bug: 185623118
Change-Id: I392b420b849a329e3e24d8e8dcf0b84a63d37799
2021-04-19 00:14:49 -07:00
ykhung
bcf0a411a1 Add app usage preferencee item into the history preference
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I7d9a14eca0b8d3b054e040cb13135ef15390e512
2021-04-19 04:45:11 +00:00
ykhung
b3c7bb02c4 Merge original AOSP chart into battery usage with runtime switchable am: 33115020ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215688

Change-Id: I2f8b577b5ace58923ae1acbb697cb1b51b0c874c
2021-04-18 16:22:04 +00:00
ykhung
33115020ba Merge original AOSP chart into battery usage with runtime switchable
This patch is merged from ag/14111128 and seperate two different chart
design between isChratGraphEnabled() method, but we drop the options
menu in the both versions to align the new material next design.

Bug: 185187718
Bug: 185187591
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie88df6a94abf5d1652440fe35392b9f47c447537
2021-04-18 15:59:43 +00:00
ykhung
6fe3ad2787 Support badged icon for work profile mode and add system checking am: 5aa3c23535
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215687

Change-Id: I279ad55d915c81970e77a04071fe751b153fb502
2021-04-17 17:27:29 +00:00
ykhung
5aa3c23535 Support badged icon for work profile mode and add system checking
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iebe458b364ab02eaf595bfc3b1a455e5be7d3d9d
2021-04-17 13:29:07 +00:00
ykhung
c0f9c69402 Purge low percentage BatteryDiffEntry from indexed usage map am: 3cdf60c016
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209652

Change-Id: Ib669083c6959f19e7fbfaca93e729af616cced9f
2021-04-17 11:56:23 +00:00
ykhung
3cdf60c016 Purge low percentage BatteryDiffEntry from indexed usage map
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I943e224147ccbfa80578511d6cb0d6adf6f8da0f
2021-04-17 10:22:11 +00:00
Syaoran Kuo
92a923c9bf Merge "Adds new test for notification." into sc-dev am: f608d1e7b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124306

Change-Id: I73c81ffbf50ae22b8cbbb189c46634c8b1fe517c
2021-04-16 09:14:08 +00:00
YUKAI HUNG
b98ea3430d Merge "Refine logic and add simple test for BatteryChartPreferenceController" into sc-dev am: edfa085b2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199745

Change-Id: Ie7a2005de7660e962f474eb26d0a824ec8fcd3c8
2021-04-16 09:13:26 +00:00
Syaoran Kuo
f608d1e7b6 Merge "Adds new test for notification." into sc-dev 2021-04-16 08:58:01 +00:00
TreeHugger Robot
7fcfd25219 Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev am: ab12e78a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199750

Change-Id: I43ba102697afd7d07d89bac27b49863f47c2e235
2021-04-16 07:06:26 +00:00
ykhung
ab5e180139 Refine logic and add simple test for BatteryChartPreferenceController
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie218cf967c6f30c6eadcdfe6bfd3f37ccdc2276e
2021-04-16 07:02:04 +00:00
TreeHugger Robot
ab12e78a10 Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev 2021-04-16 06:50:01 +00:00
Ryan Lin
272ebbb9fe Merge "Extract the logic of MagnificationMode to the controller" into sc-dev am: 3a34a5767b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065249

Change-Id: Ia6ee7f90e2aa4f7751fd7c3e26384b0485699396
2021-04-16 03:54:47 +00:00
Ryan Lin
3a34a5767b Merge "Extract the logic of MagnificationMode to the controller" into sc-dev 2021-04-16 03:50:27 +00:00
Biswarup Pal
48bb439db6 Fix TranscodeDisableCachePreferenceControllerTest
Test: TranscodeDisableCachePreferenceControllerTest
Bug: 185483742
Change-Id: Ie448929fb50a49a0641baf6456df11430bb9f1c6
2021-04-15 20:08:48 +00:00
kholoud mohamed
551f8b20e1 Enable ignored test
Test started failing after a change in PermissionChecker
that started using an unshadowed API in AppopsManager.
Reenabling the test after fixign that.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsTest
Fixes: 184238335
Change-Id: I3dc97366671cb1ff8b6a3482b02f6e2148bdda40
2021-04-15 15:51:53 +01:00
Biswarup Pal
940cb585fa Merge "Implement controller to disable transcoding cache" into sc-dev am: acb5bebb3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186626

Change-Id: If620a754483bc848c5b5eb5ec68e80cafc00854a
2021-04-15 11:37:22 +00:00
Biswarup Pal
acb5bebb3d Merge "Implement controller to disable transcoding cache" into sc-dev 2021-04-15 11:24:27 +00:00