Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,345 Commits 1 Branch 0 Tags
6830641753f404708cb6580ead306a0980f2bad6
Commit Graph

80345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitri Plotnikov
6830641753 Merge "Remove references to BatteryStatsHelper from AppBatteryPreferenceController" into sc-dev am: b72d0ee651 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13863822

Change-Id: Ic1829af73cceedac8a43c1ce887b1f66fe6e0488
 2021-03-18 04:02:35 +00:00
TreeHugger Robot
16f3a1f3dd Merge "Hide non-system overlay windows in RequestIgnoreBatteryOptimizations." into sc-dev am: 735281a739 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13902431

Change-Id: I9938b6b939c3ef377f4ae6c630bd597a3c79e9f6
 2021-03-18 04:02:28 +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
78991823b0 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: Ic95a274696769e8699855757d36b85beec6354ba
 2021-03-18 02:18:54 +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
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
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
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
6f41bb5722 Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev 2021-03-17 15:21:17 +00: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
bebef20ae9 Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev am: c7d3c5f1be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815935

Change-Id: I4cbafaba92c18f490c673a9d06750b7dfe586ea2
 2021-03-17 10:50:37 +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
ddbd32432e Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939

Change-Id: I2492c9b4e7bb5b34ad6b3719525e8b00433d2778
 2021-03-17 07:02:17 +00:00
TreeHugger Robot
76b437502b Merge "Update string for Intent Picker" into sc-dev am: fdb6af2d20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892866

Change-Id: I8d8510291d42a9986fa8786666faea19de54ca6e
 2021-03-17 06:41:50 +00:00
TreeHugger Robot
d522b2325c Merge "[Provider Model] Update airplane mode icon" into sc-dev am: c35e0bfa58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885664

Change-Id: I045fa25395643c654c17a5d6eab90cc05bfcaa87
 2021-03-17 06:41:44 +00:00
Lucas Lin
5ee7a7d07d Merge "Change the parameter type from ContentResolver to Context" 2021-03-17 06:35:21 +00:00
TreeHugger Robot
fdb6af2d20 Merge "Update string for Intent Picker" into sc-dev 2021-03-17 06:35:14 +00:00
TreeHugger Robot
c35e0bfa58 Merge "[Provider Model] Update airplane mode icon" into sc-dev 2021-03-17 06:16:20 +00:00
Edgar Wang
caabd509fe Merge "Change packagename of TwoTargetPreference" into sc-dev am: 0c914077aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13566505

Change-Id: Ic7249f7aa910eead9e0650f00700d13c38afc617
 2021-03-17 05:20:15 +00:00