Commit Graph

100049 Commits

Author SHA1 Message Date
Frank Li
cd2bbccf3a Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" 2022-01-27 08:47:55 +00:00
Junyu Lai
d7451d16ff [MS48.2] Remove NetworkStatsHistory from CycleAdaptor
While the ChartData changes the types of stored data.
Modify CycleAdaptor accordlingly for the compatibility.

Test: atest clockwork-settings-robotests
      make RunSettingsRoboTests -j40
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=DataUsageControllerTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleChartDataLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleDataForUidLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleDataLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=DataUsageUtilsTest
Bug: 204830222
Ignore-AOSP-First: Related API conflict, need master first.

  (cherry-picked from ag/16686514)

Change-Id: Ia778d680d5354fb67476db0763dfab017284dc4a
Merged-In: Ia778d680d5354fb67476db0763dfab017284dc4a
2022-01-27 08:46:05 +00:00
Xiao Ma
0042654d60 Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86 am: 2287aa1993 am: fc3365f6d5 am: 04c20d1381
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166

Change-Id: I8c4764fb38e7d9241e4801e1fce4bc2f0ad118ee
2022-01-27 08:01:04 +00:00
Xiao Ma
04c20d1381 Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86 am: 2287aa1993 am: fc3365f6d5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166

Change-Id: I1b6ea198e7c82ffed62abe87cf694a9f0bdf389b
2022-01-27 07:46:22 +00:00
Xiao Ma
fc3365f6d5 Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86 am: 2287aa1993
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166

Change-Id: I93071ad4ef3ae2e2a333b3e510af82587a34b29c
2022-01-27 07:31:02 +00:00
Xiao Ma
2287aa1993 Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166

Change-Id: I324d48263c1d6ff5aa8eddb8917188087383e6f5
2022-01-27 07:13:01 +00:00
Xiao Ma
fa785d2c86 Merge "Fix EthernetManager.addListener dependency in Tethering settings." 2022-01-27 06:59:12 +00:00
hoffc
b4831d9fde Settings: Fix FC when learn more textview help intent is NULL
Click the learn more textview in footer preference and trigger its help intent action. FC occurs when its help intent is NULL.

Add NULL check and hide the learn more textview if its help intent is not set.

Buganizer: 216401549

Change-Id: I3bad6814ef399d1ecd3003649edf42102478242b
Merged-In: I4e7a7c926205be1179d55d33ada345024c8a44ab
2022-01-27 06:08:19 +00:00
Yuri Lin
b5e4fabf76 Merge "Change zen schedules page to use switches." 2022-01-27 04:51:46 +00:00
Weng Su
79c30c0a3e Add CHANGE_WIFI_STATE request to PICK_WIFI_NETWORK intent
- Add CHANGE_WIFI_STATE permission to WifiPickerActivity

Bug: 183410556
Test: manual test
Use b/183410556#comment4 app-debug.apk to verify the solution

Change-Id: Ie9295c129bc87cb66c67377db64ba716046e9daf
2022-01-27 03:57:21 +00:00
Jason Chiu
0ca89079f1 Merge "Fix broken SettingsSliceProviderTest" 2022-01-27 02:09:30 +00:00
Wilson Wu
d3582455e6 Merge "Introduce AvailableVirtualKeyboardFragmentTest" 2022-01-27 01:41:10 +00:00
Arc Wang
283a085b2f Merge "Fix UI problems of PublicVolumeSettings" 2022-01-27 01:32:03 +00:00
Pyuli Naithani
d140857954 Add "All services" settings in the App Preference screen for GmsCore.
BUG: 188920241

Test: N/A

Change-Id: Icf475f4a6c7498cd9782524806b0335e9cb0f8fc
2022-01-26 21:36:25 +00:00
Yuri Lin
0a7554acfa Cosmetic changes to zen mode people & sound/vibration screens
On the people screen, have the footer show up all the time and provide a more relevant message (indicating that the chosen people override any app/etc settings) than the current setting.

On the sound/vibration screen, remove the sub-title since it's a bit confusing what exactly is being turned on or off.

Bug: 190180868
Bug: 215564123
Test: manual
Change-Id: I78d407af350a9f99d26d1e5082b752881bd3f186
2022-01-26 13:01:26 -05:00
TreeHugger Robot
2486e07301 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4636172136 -s ours am: bcf447c371 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c5fe362932b1746567097011e9ee1a2939eaa8e
2022-01-26 17:12:26 +00:00
TreeHugger Robot
bcf447c371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4636172136 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46d04c4185b62f87cdb3dd1ab315871f052655a3
2022-01-26 17:07:10 +00:00
TreeHugger Robot
f21d79502a Merge changes from topic "presubmit-am-c45b2d983b9d4ec78289228420413054" into sc-v2-dev-plus-aosp am: c54ae54340
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712346

Change-Id: Idd2e71889fec6d33d1e354a16e6fa427c98dc7f4
2022-01-26 17:06:49 +00:00
Bill Yi
b93ef1c8c9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2953e0c45f am: c7a1715bba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba34e9952c176c3cd93da0777df313e050da332f
2022-01-26 17:06:45 +00:00
TreeHugger Robot
4636172136 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-26 16:53:16 +00:00
TreeHugger Robot
c54ae54340 Merge changes from topic "presubmit-am-c45b2d983b9d4ec78289228420413054" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2953e0c45f
  Import translations. DO NOT MERGE ANYWHERE
2022-01-26 16:53:16 +00:00
Yuri Lin
a91e2daea7 Change zen schedules page to use switches.
Also add clearer summaries for schedule and calendar events (rather than just "Off" and "On"): for schedules, list the days & times for which the schedule is active, and for events, the calendar whose events it triggers on.

Bug: 190180868
Bug: 215564123
Test: manual for switches, ZenRuleScheduleHelperTest for descriptions

Change-Id: I3ad579503adae0a66dfa3093b4e3df77db0ede31
2022-01-26 11:21:53 -05:00
Steven Ng
3859251be0 Add dark theme custom type into the dark theme settings page
Also fix some test cases.

I'd prefer using Robolectric shadows rather than mocking Android
framework classes. However, I can't do that in this CL due to the
lack of multiple shadow classes support.

Test: make RunSettingsRoboTests -j56
      ROBOTEST_FILTER=com.android.settings.display.darkmode.*
Bug: 215182463
Change-Id: If557d2933927a5dd0fadd3f6db6bb6f0ab7dd5ee
2022-01-26 16:15:52 +00:00
Bill Yi
54b3b5c48d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours am: aa11fcd96f -s ours am: acb6773c38 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c5b6caa80a899055a24c0d5b6317afcd9bb14d8
2022-01-26 15:50:32 +00:00
Bill Yi
2ebfed15fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours am: 30ee2e7136 -s ours am: 7c8beef704 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If63efcd9df3a4346fb5cb4c56109179ee6bdd58a
2022-01-26 15:50:20 +00:00
Bill Yi
bc6d638055 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c556615f57 -s ours am: ce7fdd781e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82e8759b4e206d2f8f791acfc34a01ebe8dbfba8
2022-01-26 15:49:51 +00:00
Bill Yi
acb6773c38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours am: aa11fcd96f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idabfcd4e31707f1c52036f1af2d477bf1a6c7d95
2022-01-26 15:49:48 +00:00
Bill Yi
0de21781df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: abf6fc3cde -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94d67b6d844a5b67853413556924f60e5f63a5cb
2022-01-26 15:42:44 +00:00
Bill Yi
7c8beef704 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours am: 30ee2e7136 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5dddd432bf6f9f56e8c3febcab1b204bcc8a80b
2022-01-26 15:42:27 +00:00
Bill Yi
aa11fcd96f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9823276258e918fa2721294a41fb31057a6b723
2022-01-26 15:36:41 +00:00
Bill Yi
30ee2e7136 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62e3fe5f3d402d641b715ebf75420984f987d223
2022-01-26 15:36:35 +00:00
Bill Yi
ce7fdd781e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c556615f57 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32b1cf2f17562e58b37a475de95e59aab1ba0d30
2022-01-26 15:34:58 +00:00
Lais Andrade
91560a91d4 Merge "Rename Sound settings page to "Sound & vibration"" 2022-01-26 14:28:11 +00:00
Lais Andrade
01baa2f640 Merge "Add VibrationPreferenceControler to check availability" 2022-01-26 14:27:45 +00:00
Etienne Ruffieux
865cad2665 Removed mocked BluetoothAdapter
Bluetooth adapter can not be mocked anymore, using config
resource instead.

Tag: #feature
Bug: 216422716
Test: robotest
Change-Id: I92e503cbceb8412031c7f3b08a3e1016d38da18c
2022-01-26 13:26:00 +00:00
Junyu Lai
25e26ea7af [MS49] Remove NetworkStats hidden Api usages
This includes:
1. Remove unused INetworkStatsService and NetworkStatsHistory.
2. Replace NetworkTemplate usages with builder.
3. Replace TrafficStats references to DataUnit.
4. Reimplement NetworkTemplate#normalize.

Test: make RunSettingsRoboTests
Bug: 204830222
Change-Id: I8efecda5df403e9ed588daecd169cb3498d213a2
2022-01-26 11:05:57 +00:00
SongFerng Wang
b5318d465b Merge "The list does not follow the UX dialog design doc in alert dialog." 2022-01-26 08:55:19 +00:00
Jason Chiu
61db863533 Fix broken SettingsSliceProviderTest
Fix: 214944418
Test: robotest
Change-Id: Ib96bbcecbe9fab91ecae6fcaf32f90c11c3caced
2022-01-26 16:06:55 +08:00
SongFerngWang
f2a8008ae3 The list does not follow the UX dialog design doc in alert dialog.
Please refer the comment#1 at bug and there are change below
- the divider is 4dp
- the item's radius is different in the list.

Bug: 216233391
Test: manual test: check the UI
make RunSettingsRoboTests ROBOTEST_FILTER=SimListDialogFragmentTest (PASS)

Change-Id: I758d60202fcf477aeb49014e60b949e7ad08c082
2022-01-26 12:49:59 +08:00
Florian Mayer
2b8951f0ef Clarify language and fix typo.
Bug: 206895651
Change-Id: Ifbaa29510233bc0edea398ad23fbb2fc79855218
2022-01-26 01:37:08 +00:00
Kevin Han
350a1785de Pull unused app count from PermissionController
Use the new PermissionControllerManager API to get the number of unused
apps directly from PermissionController instead of replicating the
logic

Bug: 200087723
Test: atest HibernatedAppsPreferenceControllerTest
Change-Id: I989219cfb2a44b5acb054ff5fb744e68d8e118b3
2022-01-26 01:07:38 +00:00
menghanli
95eba64f85 Support OHM quick settings tooltips when feature on
Bug: 210356011
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityShortcutPreferenceFragmentTest
Change-Id: I3b35d9bb347b7e516db94a4b801a4484f6f38ca8
2022-01-26 07:55:52 +08:00
menghanli
6892e89775 Support extra dim quick settings tooltips when feature on
Bug: 210356011
Test: Manual testing
Change-Id: I501d21e00a1599a79f9490a5a6f4bd246c2ec8d4
2022-01-26 07:55:39 +08:00
menghanli
9e4a9d6742 Support color correction quick settings tooltips when feature on
Bug: 210356011
Test: Manual testing
Change-Id: I0a981850d0cf9db0154b1381f365a5fd4b18a9f1
2022-01-26 07:55:27 +08:00
menghanli
a72edbb7b7 Support color inversion quick settings tooltips when feature on
Bug: 210356011
Test: Manual testing
Change-Id: I8be14ecb2f42c1cb1142c2d9fe8319e3307a7a23
2022-01-26 07:55:15 +08:00
menghanli
ba9f097b03 Integrate Accessibility quick setting tooltips widget into ToggleFeaturePreferenceFragment
- Show tooltips when main switch is on
- Reshow tooltips when rotate device
- Add abstract functions for child components to show tooltips

Bug: 210356011
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleFeaturePreferenceFragmentTest
Change-Id: I543d8af7d24a9fc82659625961850f975a7a0787
2022-01-26 07:54:57 +08:00
Xiaowen Lei
b11d8a44c9 Log user action for selecting dream.
Test: on device via statsd_testdrive
Bug: 213906448

Change-Id: Ida57a6755054c0741f3fb0c2222425535150fb5a
2022-01-25 22:20:39 +00:00
Jonathan Scott
e0d439472f Allow Device Management Role Holder to update Settings strings.
Test: manual
Bug: 188414370
Change-Id: I6e1a06619799a9e99382d791e72e2e4518f93cac
2022-01-25 19:03:24 +00:00
Yuri Lin
8b8b06404c Merge "Rename Do Not Disturb -> Priority Mode" 2022-01-25 19:03:06 +00:00
Etienne Ruffieux
47d115c3ff Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062 am: 6f6f5e6b42 am: fe5b587245 am: 32c19cf335
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: Idb1f5503265f831f6efa7c20cb3b5f15dbafad75
2022-01-25 15:21:00 +00:00