Commit Graph

80546 Commits

Author SHA1 Message Date
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
Treehugger Robot
207fa629bc Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940

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

Change-Id: If019c9b540f58e82b250693ed05dfabcda2c7c66
2021-03-18 03:19:28 +00:00
Treehugger Robot
959325e88a Merge "Replace hidden CM#isNetworkSupported() usage" 2021-03-18 02:39:21 +00:00
Chiachang Wang
2f66e59e05 Merge "Replace the hidden ProxyInfo methods usage" 2021-03-18 02:37:00 +00:00
Chiachang Wang
ce97d11d5f Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae am: f60f9ec14c am: 77dc754137
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: Iff4054c1e77b1bc229b4010f625db0e214521a4b
2021-03-18 02:17:57 +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
Chiachang Wang
cda53ebeae Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: I6794a8d8113b5167b24e875554bc54b9155dd97f
2021-03-18 00:42:40 +00:00
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
c5844949ad [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: I416f3e7af6a09e5e6b5b80cdbd6749ce04fc2f5a
2021-03-17 22:25:51 +00:00
Peter Wang
3091978e7a 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: I72404bc62312ee671238323332b970fad54d1510
2021-03-17 22:20:04 +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
d53fa89b32 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: I5ec713bef2af649b387aa199f2f1de7b94f8b31e
2021-03-17 22:05:45 +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
1871042664 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: I019ec2f2f5ed6ec8d2be519d821ee7f139af4bb3
2021-03-17 22:02:02 +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
87c1d43500 Transition BatteryAppListPreferences to BatteryUsageStats API am: 036dc189b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13863806

Change-Id: I0507d54255368b6c9ea4fa05b7da2b9322deb326
2021-03-17 21:37:06 +00:00
Dmitri Plotnikov
b108acaad0 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: I7c1c8c6a8ceb7fb39534f2b3f65582492df99908
2021-03-17 21:32:58 +00:00
TreeHugger Robot
7471ad05c2 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: Iad657de7b8d2db603761218f00d693ba59242fd8
2021-03-17 21:14:33 +00:00
Yanli Wan
1f23717f1c 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: I74da80074007ef13e57bcf8aca63b801857bcec6
2021-03-17 21:14:25 +00:00
TreeHugger Robot
3375e5b8bf 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: I026fe95e25df6f8f257118ca7f6a89838fae8345
2021-03-17 21:14:17 +00:00
TreeHugger Robot
651e08c8a1 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: Idb961520cbb443650c7d021e0b164116230d73c4
2021-03-17 21:14:04 +00:00
Lucas Lin
90ff110c47 [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: Ib749302ff523c8740eb1c52694b3af3a8ab5a0d2
2021-03-17 21:04:45 +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
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
03c2ccba3e 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: I3162e0f749d8cd30e924ccbf843d17b23ee718cf
2021-03-17 15:31:31 +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