PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,498 Commits 1 Branch 0 Tags
ba2c4f5bf084c84bffce4c2f0eacfa7607f11181
Commit Graph

11409 Commits

Author SHA1 Message Date
Yanting Yang
bf8d9d7490 Merge "Fix NPE of AppVersionPreferenceController" into sc-dev am: 8f414f2e0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13886027

Change-Id: I98435d5ac5e267d6eb8ad7e1757a2add2bbec742
 2021-03-18 05:09:35 +00:00
Yanting Yang
8f414f2e0f Merge "Fix NPE of AppVersionPreferenceController" into sc-dev 2021-03-18 04:48:54 +00:00
Dmitri Plotnikov
0e853e53d3 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: I26af5e38484e379b589c1dfe14a8d3ee16dc745c
 2021-03-18 04:02:19 +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
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
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
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
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev 
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
 2021-03-17 19:09:29 +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
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
6f41bb5722 Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev 2021-03-17 15:21:17 +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
TreeHugger Robot
2bad0d6b35 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: I9685a196017eef12618efd72d31421a5cc27f4e9
 2021-03-17 10:44:22 +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
Edgar Wang
e92aa74878 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: I8157b4547e76761c7868fae41c69cc4979d41166
 2021-03-17 05:17:00 +00:00
Edgar Wang
0c914077aa Merge "Change packagename of TwoTargetPreference" into sc-dev 2021-03-17 05:08:21 +00:00
jasonwshsu
c2057ae257 [Accessibility button settings] Remove half circle option in size selector 
Half circle accessibility floating menu mode changed to be triggered from gesture.

Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: I123baaf3684d5cbb0a33fc2383da72aa022876c0
 2021-03-17 02:44:48 +00:00
Rajeev Kumar
378fcf6547 Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev am: 815558188f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879789

Change-Id: I6dd1b17fcaecc628fa93a87cafdafc77a5774a82
 2021-03-16 17:17:47 +00:00
Rajeev Kumar
815558188f Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev 2021-03-16 16:50:02 +00:00
Bonian Chen
d42d9a41f6 Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 am: c27980c1a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
 2021-03-16 14:45:42 +00:00
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines 
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
 2021-03-16 10:24:24 +00:00
Salud Lemus
0e0247e5e4 Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device 
Bug: 182839352
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest

Change-Id: I42bb9ce9a624fa20cd755af2d323b4c4f94048f7
 2021-03-16 01:42:07 +00:00
Abel Tesfaye
ea7d718396 Merge "Fix auto-rotate summary not updating on devices without smart-auto-rotate" into sc-dev am: e12ad9777e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13842305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92f6be6e08d536316c124710cca445686deff007
 2021-03-15 17:06:15 +00:00
Abel Tesfaye
e12ad9777e Merge "Fix auto-rotate summary not updating on devices without smart-auto-rotate" into sc-dev 2021-03-15 16:27:16 +00:00
tim peng
4c73082f9d Merge "Show advanced Bluetooth information in device detail page" into sc-dev am: 28d9db3c86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib01fa53298e2d44d08c3336a2c08d41a5caaee59
 2021-03-15 05:50:55 +00:00
tim peng
28d9db3c86 Merge "Show advanced Bluetooth information in device detail page" into sc-dev 2021-03-15 05:26:45 +00:00
Jeremy Goldman
18b91319bd Merge changes I94a881df,I59fd7765 
* changes:
  VpnPreferenceControllerTest converted to JUnit
  Warning / Info icon added for the VPN Preference
 2021-03-15 04:44:40 +00:00
Jeremy Goldman
7361f8557c VpnPreferenceControllerTest converted to JUnit 
global settings string set to guarantee pre-test environment.
PreferenceManager and PreferenceScreen instantiated instead of mocks,
and mock preference inserted with getKey function overridden.

Bug: 176821216
Test: atest -c VpnPreferenceControllerTest
Change-Id: I94a881df13d1b35126de10f561d657136e4fed7f
 2021-03-15 03:36:37 +00:00
Tim Peng
90df1c9de1 Show advanced Bluetooth information in device detail page 
-Apply new metadata on aosp/1596412

Bug: 182338346
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest
make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest

Change-Id: Ic48ed9213111d0c6ec19b317d4c22e1400261706
 2021-03-15 10:16:14 +08:00
TreeHugger Robot
8131f65703 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev am: 70e508edd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13839798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ca17ace2411223eea45fdb9cfca32fa0853d262
 2021-03-15 02:01:59 +00:00
TreeHugger Robot
70e508edd4 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev 2021-03-15 01:53:00 +00:00
Dmitri Plotnikov
656c67c01d Encapsulate BatterySipper and BatteryConsumer in BatteryEntry 
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryEntryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.AdvancedPowerUsageDetailTest

Change-Id: I67ab825c25b85012b5713736db62e0beb4d98a16
 2021-03-13 12:51:47 -08:00
Abel Tesfaye
e57c87528d Fix auto-rotate summary not updating on devices without smart-auto-rotate 
Test: locally with crosshatch

Bug: 181585193
Change-Id: I571b10556ff2f4f4d6ff960fcfdf7866405d5ee5
 2021-03-13 02:14:57 +00:00
TreeHugger Robot
7184295054 Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev am: 38e0dae439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13803384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06231512af655da4f29e16f2108533fd6d6b759d
 2021-03-13 00:25:23 +00:00
TreeHugger Robot
38e0dae439 Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev 2021-03-12 23:52:00 +00:00
Dmitri Plotnikov
820bee81d6 Transition BatteryInfo and BatteryUtils to BatteryUsageStats API 
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryHistoryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoLoaderTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.batterytip.detectors

Change-Id: I469ff8b88aa3307422c02f51943df4ef1759db56
 2021-03-12 14:08:42 -08:00
Zoey Chen
b8a639f8fd [Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen 
Bug: 175270951
Test: make and atest
Change-Id: I15e1a199e6a34914db97055bfea9392c5bbdc9c6
 2021-03-12 19:27:05 +08:00
Weng Su
7b04b316ed Merge "[Provider Model] Update Airplane mode message" into sc-dev am: d0e98010c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I181d2ad73e8c82424dab13cbc7489c01ec8145e9
 2021-03-12 07:29:54 +00:00
Weng Su
d0e98010c4 Merge "[Provider Model] Update Airplane mode message" into sc-dev 2021-03-12 07:04:52 +00:00
Hugh Chen
9d00364da4 Fix bluetooth settings will broadcast to anywhere when some cases 
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will compare to calling package name with launch package name.
If they are not equal, the broadcast will not send to launch package name.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Ib8a5acde663e875912d300dd4912c4e9416f02f1
 2021-03-12 14:56:57 +08:00
Weng Su
8ce423cdd2 [Provider Model] Update Airplane mode message 
- Show Airplane mode message when Airplane mode is enabled

- Show the same message whether Wi-Fi is enabled or disabled

- Screenshot:
  https://screenshot.googleplex.com/9FgqG7WWskRLZxo
  https://screenshot.googleplex.com/4g4kvnAT6aYN57s

Bug: 181858434
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3cb5a8bc7cb4d1e8678eb6d75116effd00ac9432
 2021-03-12 11:49:46 +08:00
TreeHugger Robot
1f657a95ae Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev am: 9086ed36a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3636c58d85d3df9945418203333f62ec20ced928
 2021-03-11 23:14:48 +00:00
TreeHugger Robot
9086ed36a8 Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev 2021-03-11 22:37:50 +00:00
Fan Zhang
9fdceaea78 Fallback to AOSP eSOS settings page if OEM impl fails 
When OEM eSOS implementation fails for any reason (app disabled,
misconfigured, etc), Emergency SOS settings should fallack to the
default settings page (rather than hiding the setting entirely)

Bug: 180959553
Test: robotests
Change-Id: I31c08449eff3f01d4c33bf827023f17beade93c2
 2021-03-11 20:30:55 +00:00
Almaz Mingaleev
5238602615 Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev am: 4a3ff95367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816452

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia67d2fba5b231a7508158c61df75cae77717b4ab
 2021-03-11 14:22:19 +00:00