Chiachang Wang
dd61e5d664
Merge "Replace the way to access StaticIpConfiguration"
2021-03-18 00:23:14 +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
Lucas Lin
8116daf4c9
[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d am: ddbd32432e am: 5c73826020 -s ours am: a565961bf0 -s ours
...
am skip reason: skip tag Change-Id I6c06460b67f81112db311f0739457d5f1e2e4554 with SHA-1 8ffc3908ff is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939
Change-Id: I37b4170ed8d46527aea31618ea6c1cdef7fe64ec
2021-03-17 22:26:37 +00:00
Peter Wang
d421390d9a
Merge "Fix coding styles for erase euicc only options" into sc-dev am: 3f7d415e2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13894357
Change-Id: I5f831ac3fd63fb99dfafd9c78d86ade9e3b3f9f6
2021-03-17 22:21:32 +00:00
TreeHugger Robot
f43aa28809
Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6 am: 2bec77689e am: 09861022ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828
Change-Id: I6e9c2fc4e71a0dc0c5d98bd100c019cfb4cbb986
2021-03-17 22:21:28 +00:00
Colin Cross
2a4761ab15
Merge "resolve merge conflicts of d42d9a41f6 to sc-dev" into sc-dev am: 321f413343
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13904045
Change-Id: I01072029e853261efefedf30bafa16c66a110661
2021-03-17 22:19:40 +00:00
Lucas Lin
a565961bf0
[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d am: ddbd32432e am: 5c73826020 -s ours
...
am skip reason: skip tag Change-Id I6c06460b67f81112db311f0739457d5f1e2e4554 with SHA-1 8ffc3908ff is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939
Change-Id: Ia2b0bf14f32d65ad0f5e44100b9dcc3402b21a3b
2021-03-17 22:13:33 +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
42249f9852
Transition BatteryAppListPreferences to BatteryUsageStats API am: 036dc189b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13863806
Change-Id: I2565c9c9c3c23acebae7df8f7f20c28eca2d57b6
2021-03-17 21:14:51 +00:00
Dmitri Plotnikov
f2d52e55d8
Merge "Remove smearing of hidden BatterySipper power" into sc-dev am: dba51aa233
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13855858
Change-Id: I2ab415eee4a98914c326c68a209c803f273e52a2
2021-03-17 21:14:25 +00:00
TreeHugger Robot
463fa4b828
Merge "Hide "recent access" and "see all" when location off" into sc-dev am: 0cfa67f8a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13896392
Change-Id: Ie86df82c2e4043635e99d92c3b4e48aa3ffb5b90
2021-03-17 21:13:47 +00:00
Yanli Wan
0d461b4408
Merge "Update Device Admin Info admin message for a financed device" into sc-dev am: 3eecb32108
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892070
Change-Id: I04cd044eb52658777e4fd32ca16ccb47a0db13a8
2021-03-17 21:10:27 +00:00
TreeHugger Robot
63d4165b98
Merge "Encapsulate BatterySipper and BatteryConsumer in BatteryEntry" into sc-dev am: 60cc9e507b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13821292
Change-Id: I420c8350efe267eb661db9124ebe70178e13279d
2021-03-17 20:58:56 +00:00
TreeHugger Robot
b0b9c1065e
Merge "FakeUid: measured energy for Wifi, Bluetooth" into sc-dev am: 99b3468b1c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13838208
Change-Id: I7bbd2107adab49b052e68479466f41e0e4499655
2021-03-17 20:54:20 +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
Lucas Lin
f2d2abaaff
[automerger skipped] Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889 am: 73c971a5af am: e30a49423b -s ours am: 162d7df130 -s ours
...
am skip reason: skip tag Change-Id I024c3ddfb85f4c3d177e2e99294c998d81d4e08d with SHA-1 b07054ca9c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I40968dde0a36b2576a7dcd7f1f2b91e64677ce6b
2021-03-17 19:43:14 +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
Oli Lan
a984be6fdb
Add a setting to turn clipboard access notifications on/off.
...
This adds a new switch setting under Privacy to control whether
toast notifications are shown when an app accesses clipboard
(see b/179667029 for the clipboard access notification feature).
Bug: 179667029
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.privacy.ShowClipAccessNotificationPreferenceControllerTest"
Change-Id: Ibac7f31538ab3e4d2ec476cb8c05cbbd0c7e6d41
2021-03-17 17:54:30 +00: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
Yanli Wan
3eecb32108
Merge "Update Device Admin Info admin message for a financed device" into sc-dev
2021-03-17 17:35:36 +00:00
sallyyuen
d5029fc823
Update RBC UI with latest strings
...
Get rid of the slider (no longer need labels)
Test: Manual
Bug: 182922255
Change-Id: Ib3d0c8ad823af55848f2526f3377ff11b4196f54
2021-03-17 10:06:19 -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
Lucas Lin
162d7df130
[automerger skipped] Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889 am: 73c971a5af am: e30a49423b -s ours
...
am skip reason: skip tag Change-Id I024c3ddfb85f4c3d177e2e99294c998d81d4e08d with SHA-1 b07054ca9c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I5bd375b31ad388ca507852d8be8e259693320655
2021-03-17 16:05:22 +00:00
Chiachang Wang
13d03f41b9
Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev am: 6f41bb5722
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892870
Change-Id: Ia1cf2b31e8aba0ae944ceca2dad0ffd9fde7b9c0
2021-03-17 15:31:46 +00:00
Chiachang Wang
d507dc19b1
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
Merged-In: I8f1d11558b1be575a0777ed195abe027e838cb74
2021-03-17 15:22:40 +00:00
Chiachang Wang
6f41bb5722
Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev
2021-03-17 15:21:17 +00:00
SongFerngWang
1dcc788177
KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray
...
Bug: 179814490
Test: build pass
Change-Id: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
2021-03-17 23:18:33 +08: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
799ead4d41
Update the vector drawable for accessibility button preview preference
...
cherry picked from commit 96121b3f0d
Bug: 173940869
Test: manual test
Change-Id: Id24d1550e7c640a7fdbd752e3571296a7e6567d6
Merged-In: Id24d1550e7c640a7fdbd752e3571296a7e6567d6
2021-03-17 23:04:30 +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
SongFerngWang
2166de23f3
Change the behavior of notifyAllowedNetworkTypesChanged.
...
Bug: 180903931
Test: atest AllowedNetworkTypesListenerTest.java
Change-Id: Ic94816415920bf25896ef2b198e228f369039c94
Merged-In: Ic94816415920bf25896ef2b198e228f369039c94
2021-03-17 21:20:21 +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