Commit Graph

35778 Commits

Author SHA1 Message Date
Dmitri Plotnikov
e4fc48f33e Merge "Remove references to BatteryStatsHelper from PowerUsageBase" into sc-dev 2021-03-18 15:33:47 +00:00
TreeHugger Robot
11ea8316e0 Merge "Refinements for DND settings" into sc-dev 2021-03-18 14:35:19 +00:00
Almaz Mingaleev
39396b0bb2 Merge "Fix imports in LocationTimeZoneDetectionPreferenceController." into sc-dev 2021-03-18 09:23:30 +00:00
TreeHugger Robot
cb64ea60c2 Merge "Smart Router settings UI changes" into sc-dev 2021-03-18 06:43:16 +00:00
Dmitri Plotnikov
313dbc0355 Remove references to BatteryStatsHelper from PowerUsageBase
Bug: 180630447
Bug: 173745486

Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: Ifed69c4fdd741f75b0b962f9d3200f0ed533358f
2021-03-18 06:07:29 +00:00
Kunhung Li
5f2cf8e695 Clear WallpaperPicker task before launch
There are different launch sources to start WallpaperPicker, clear
previous task to prevent keeping old activity.

Bug: 177638480
Test: make RunSettingsRoboTests
Change-Id: Ia4d3d5c7e5df4a5d3acb137f644939c079d5028f
2021-03-18 05:37:14 +00:00
SongFerng Wang
45726b937b Merge "Moving the error messages from slice to panel's subtitle" into sc-dev 2021-03-18 04:58:50 +00:00
TreeHugger Robot
46fdf4d5be Merge "Transition HighUsageDetector to BatteryUsageStats API" into sc-dev 2021-03-18 04:57:29 +00:00
Jason Hsu
b1f6c4658c Merge changes from topic "accessibility_floating_menu_ui" into sc-dev
* changes:
  Remove half circle option in size selector
  Update the vector drawable for accessibility button preview preference
  Remove the accessibility gesture tutorial dialog in system navigation
  Update the dialog content for accessibility floating menu
  Add the preference controller to control accessibility button fade preference
  Add the preference controller to control accessibility button preview preference
  Add the preference controller to control accessibility button opacity preference
  Add the preference controller to control accessibility button size preference
  Add the preference controller to control accessibility button location preference
  Setup basic layout and resources for the accessibility button settings page
2021-03-18 04:54:54 +00:00
Yanting Yang
8f414f2e0f Merge "Fix NPE of AppVersionPreferenceController" into sc-dev 2021-03-18 04:48:54 +00:00
Chiachang Wang
75014e693d Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7 am: 168298f426
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: Ie8f4aad4c3d89e5b06800d61719478d6b4b7afdd
2021-03-18 04:34:00 +00:00
Chiachang Wang
168298f426 Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: I7e7ec3721de73523f52718665bc1763f75184a56
2021-03-18 03:41:16 +00:00
Dmitri Plotnikov
8f6c946c82 Transition HighUsageDetector to BatteryUsageStats API
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests

Change-Id: Ie8f90a67e4dd16fa67cf4f44a3678a789b3da18a
2021-03-18 03:32:43 +00:00
Dmitri Plotnikov
b72d0ee651 Merge "Remove references to BatteryStatsHelper from AppBatteryPreferenceController" into sc-dev 2021-03-18 03:32:28 +00:00
TreeHugger Robot
735281a739 Merge "Hide non-system overlay windows in RequestIgnoreBatteryOptimizations." into sc-dev 2021-03-18 03:28:19 +00:00
Chiachang Wang
77dc754137 Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae am: f60f9ec14c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: I904f5ec889d40113bf232f7935a98c6da030c9c3
2021-03-18 01:43:58 +00:00
Chiachang Wang
f60f9ec14c Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: Ie3a809e901745d7143d0b2b48023f2ddd3671480
2021-03-18 01:18:45 +00:00
Dmitri Plotnikov
296dce404e Remove references to BatteryStatsHelper from AppBatteryPreferenceController
Bug: 173745486
Bug: 180630447
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: Ic836d9f5e791d1e3ddc2237ff108190e53dcac19
2021-03-17 23:40:45 +00:00
Peter Wang
3f7d415e2d Merge "Fix coding styles for erase euicc only options" into sc-dev 2021-03-17 22:09:04 +00:00
TreeHugger Robot
09861022ab Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6 am: 2bec77689e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828

Change-Id: I82b251563ecf1b12ae4b733bcc2aa8a1dffd2d19
2021-03-17 22:04:40 +00:00
Colin Cross
321f413343 Merge "resolve merge conflicts of d42d9a41f6 to sc-dev" into sc-dev 2021-03-17 21:43:07 +00:00
Dmitri Plotnikov
036dc189b6 Transition BatteryAppListPreferences to BatteryUsageStats API
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests

Change-Id: I7af8cbcd27433b89cb2184750c6854aa74761d0d
2021-03-17 13:23:25 -07:00
Dmitri Plotnikov
dba51aa233 Merge "Remove smearing of hidden BatterySipper power" into sc-dev 2021-03-17 20:19:27 +00:00
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:09:29 +00:00
TreeHugger Robot
0cfa67f8a8 Merge "Hide "recent access" and "see all" when location off" into sc-dev 2021-03-17 18:50:01 +00:00
Julia Reynolds
887273b2c6 Refinements for DND settings
- Adding headers
- Remove collapsed 'advanced
- correcting label for main toggle
- fix underline

Test: manual
Fixes: 179210702
Fixes: 173910494
Change-Id: Iec67639a12c7e93dcf19d415108e7d2c1fcb93d4
2021-03-17 14:17:44 -04:00
Varun Shah
90321d45fb Hide non-system overlay windows in RequestIgnoreBatteryOptimizations.
Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to
SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS.

Bug: 182165099
Test: manual (test PoC)
Change-Id: Iddf697c1e8945f49c6222605c67f8f98e9c418a9
2021-03-17 10:38:56 -07:00
Dmitri Plotnikov
f941a684e1 Remove smearing of hidden BatterySipper power
Bug: 182598424
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications.appinfo.AppBatteryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest

Change-Id: I78b8d7c4faafa83de198005617e99a7f54bcd174
2021-03-17 17:01:39 +00:00
TreeHugger Robot
60cc9e507b Merge "Encapsulate BatterySipper and BatteryConsumer in BatteryEntry" into sc-dev 2021-03-17 16:57:42 +00:00
Yu-Han Yang
9e0f9b1dda Hide "recent access" and "see all" when location off
This CL also does the following:
- Change "past 24 hour access" to "recent access"
- Add timestamp to recent access app
- Remove the summary of "Location Services" button

Bug: 180533061
Test: on device
Change-Id: I0405cb6f363243db9f2c9ccf8ab8788b633d1564
2021-03-17 09:36:56 -07:00
TreeHugger Robot
99b3468b1c Merge "FakeUid: measured energy for Wifi, Bluetooth" into sc-dev 2021-03-17 16:32:53 +00:00
Chiachang Wang
6f41bb5722 Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev 2021-03-17 15:21:17 +00:00
jasonwshsu
9a5925c471 Remove half circle option in size selector
Half circle accessibility floating menu mode changed to be triggered from gesture.

cherry picked from commit c2057ae257

Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: I123baaf3684d5cbb0a33fc2383da72aa022876c0
Merged-In: I123baaf3684d5cbb0a33fc2383da72aa022876c0
2021-03-17 23:05:37 +08:00
jasonwshsu
e2c69bcd7b Remove the accessibility gesture tutorial dialog in system navigation
Accessibility gesture is replaced by the accessibility floating menu, remove the accessibility gesture tutorial dialog when choosing to use gesture navigation mode.

cherry picked from commit 1a0e2b1be5

Bug: 173990914
Test: manual test
Change-Id: Iae5297747594fcc73fc9bc14537c8fdecb86b660
Merged-In: Iae5297747594fcc73fc9bc14537c8fdecb86b660
2021-03-17 23:03:45 +08:00
jasonwshsu
31db2fafc2 Update the dialog content for accessibility floating menu
Accessibility gesture is replaced by accessibility floating menu, related content in edit shortcut dialog and tutorial dialog are updated in this changelist.

cherry picked from commit 5fe2cdcf87

Bug: 173990914
Test: manual test
Change-Id: Ie529fa8a1f8ee87ca1ec5611b35675cdfd762165
Merged-In: Ie529fa8a1f8ee87ca1ec5611b35675cdfd762165
2021-03-17 23:02:53 +08:00
jasonwshsu
648811b2b4 Add the preference controller to control accessibility button fade preference
* Opacity preference will be disabled when fade is disabled

cherry picked from commit f9fdedaafe

Bug: 173940869
Test: atest AccessibilityButtonFadePreferenceControllerTest AccessibilityButtonOactiyPreferenceControllerTest
Change-Id: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba
Merged-In: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba
2021-03-17 23:01:36 +08:00
jasonwshsu
eb2411db9d Add the preference controller to control accessibility button preview preference
* Create FloatingMenuLayerDrawable class to handle the preview layer drawable

cherry picked from commit 603014760f

Bug: 173940869
Test: atest AccessibilityButtonPreviewPreferenceControllerTest FloatingMenuLayerDrawableTest
Change-Id: Ia3d030547b377e87c505b2310f559f7f3876ecd5
Merged-In: Ia3d030547b377e87c505b2310f559f7f3876ecd5
2021-03-17 23:00:39 +08:00
jasonwshsu
c72fe39597 Add the preference controller to control accessibility button opacity preference
cherry picked from commit c497c7aabe

Bug: 173940869
Test: atest FloatingMenuOpacityPreferenceControllerTest
Change-Id: I1fbe3157c93fef4611c3b9b13569c9b339e2898a
Merged-In: I1fbe3157c93fef4611c3b9b13569c9b339e2898a
2021-03-17 22:59:03 +08:00
jasonwshsu
0377025554 Add the preference controller to control accessibility button size preference
cherry picked from commit 04955b96ae

Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: Ic206a940abde90641442df37a634c8cb3a345597
Merged-In: Ic206a940abde90641442df37a634c8cb3a345597
2021-03-17 22:57:50 +08:00
jasonwshsu
2dc32f63f8 Add the preference controller to control accessibility button location preference
cherry picked from commit 123464429d

Bug: 173940869
Test: atest AccessibilityButtonLocationPreferenceControllerTest
Change-Id: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
Merged-In: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
2021-03-17 22:57:05 +08:00
jasonwshsu
03dbb40d2b Setup basic layout and resources for the accessibility button settings page
cherry picked from commit 93ef33655c

Bug: 173940869
Test: atest AccessibilityButtonFragmentTest
Change-Id: I3f1d8b161d1baadeead36f49f18f00a91fd40b4c
Merged-In: I3f1d8b161d1baadeead36f49f18f00a91fd40b4c
2021-03-17 22:55:47 +08:00
SongFerngWang
0c86903ec6 Moving the error messages from slice to panel's subtitle
Bug: 180888831
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest NetworkProviderWorkerTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I4572c8ad15effab0c95feaeac6a99f5aaabf6f90
2021-03-17 22:49:31 +08:00
Chiachang Wang
eb16ebd14a Replace the hidden ProxyInfo methods usage
The hidden ProxyInfo methods usage should be replaced because
ProxyInfo is moving to connectivity mainline module. Setting
will not be able to access it. Replace the usage with
corresponding APIs.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiConfigControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiConfigController2Test
Test: manually update proxy from setting and check the result
Change-Id: I59192d0d5d38c833eb83cc930e358a738ebe3d13
2021-03-17 12:47:22 +00:00
Yanting Yang
e4b3b969db Fix NPE of AppVersionPreferenceController
Add null check for the package info before getting the version name.

Fixes: 168333280
Test: robotests & manual
Change-Id: If2e3d220c520d30e932478836ee2ea89f936d55c
2021-03-17 20:34:14 +08:00
Chiachang Wang
b16da1a9ca Replace the way to access StaticIpConfiguration
StaticIpConfiguration is a part of incoming connectivity
mainline module. The hidden variable is not accessible for
module outside. The caller should use getter and builder
to access it. Replace the usage with the formal way.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiConfigControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiConfigController2Test
Change-Id: I2ccd427ba19a4ec7df863c38ee0b34cf0be87fa5
2021-03-17 11:30:11 +00:00
TreeHugger Robot
c7d3c5f1be Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev 2021-03-17 10:30:48 +00:00
Chiachang Wang
ffbe4e9b1e Replace hidden CM#isNetworkSupported() usage
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settings use it to
check if device support telephony, wifi or ethernet service.
There are alternative methods to check if device supports such
features. Replace as it is.

Bug: 172183305
Test: m ; make RunSettingsRoboTests
Change-Id: I8f1d11558b1be575a0777ed195abe027e838cb74
2021-03-17 15:21:43 +08:00
Lucas Lin
5c73826020 Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d am: ddbd32432e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939

Change-Id: I1e1a332f52f0dff1dda585912e5cc41ab5296156
2021-03-17 07:20:45 +00:00
Lucas Lin
5ee7a7d07d Merge "Change the parameter type from ContentResolver to Context" 2021-03-17 06:35:21 +00:00
TreeHugger Robot
c35e0bfa58 Merge "[Provider Model] Update airplane mode icon" into sc-dev 2021-03-17 06:16:20 +00:00