PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Override 2 getSliceUri() instance to return platform slice

Browse Source 
(This is not a clear cherry-pick, @Override need to be removed.)

Bug: 126222433
Test: robotest
Merged-In: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
Change-Id: Iec9fae48e91baef5861baef946fc155b1eb37904
This commit is contained in:
Fan Zhang
2019-05-30 15:44:07 -07:00
committed by Bonian Chen
parent 5c4154b2e4
commit 6c046831de
8 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
View File

@@ -16,8 +16,11 @@
package com.android.settings.fuelgauge.batterysaver;
import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
import android.os.PowerManager;
import android.provider.SettingsSlicesContract;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -38,6 +41,7 @@ public class BatterySaverButtonPreferenceController extends
LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
private final BatterySaverReceiver mBatterySaverReceiver;
private final PowerManager mPowerManager;
private TwoStateButtonPreference mPreference;
@@ -59,6 +63,15 @@ public class BatterySaverButtonPreferenceController extends
return true;
}
public Uri getSliceUri() {
return new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(SettingsSlicesContract.KEY_BATTERY_SAVER)
.build();
}
@Override
public void onStart() {
mBatterySaverReceiver.setListening(true);

17
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -17,9 +17,13 @@ package com.android.settings.network;
import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.SystemProperties;
import android.provider.SettingsSlicesContract;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -40,6 +44,15 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
public static final int REQUEST_CODE_EXIT_ECM = 1;
/**
* Uri for Airplane mode Slice.
*/
public static final Uri SLICE_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(SettingsSlicesContract.KEY_AIRPLANE_MODE)
.build();
private static final String EXIT_ECM_RESULT = "exit_ecm_result";
private Fragment mFragment;
@@ -74,6 +87,10 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
return false;
}
public Uri getSliceUri() {
return SLICE_URI;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);

3
src/com/android/settings/panel/InternetConnectivityPanel.java
View File

@@ -23,6 +23,7 @@ import android.net.Uri;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.network.AirplaneModePreferenceController;
import com.android.settings.slices.CustomSliceRegistry;
import java.util.ArrayList;
@@ -57,7 +58,7 @@ public class InternetConnectivityPanel implements PanelContent {
final List<Uri> uris = new ArrayList<>();
uris.add(CustomSliceRegistry.WIFI_SLICE_URI);
uris.add(CustomSliceRegistry.MOBILE_DATA_SLICE_URI);
uris.add(CustomSliceRegistry.AIRPLANE_URI);
uris.add(AirplaneModePreferenceController.SLICE_URI);
return uris;
}

12
src/com/android/settings/slices/CustomSliceRegistry.java
View File

@@ -59,17 +59,7 @@ import java.util.Map;
public class CustomSliceRegistry {
/**
* Uri for Airplane mode Slice.
*/
public static final Uri AIRPLANE_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(SettingsSlicesContract.KEY_AIRPLANE_MODE)
.build();
/**
* Uri for Contextual Adaptive Sleep Slice
* Uri for Contextual Adaptive Sleep Slice
*/
public static final Uri CONTEXTUAL_ADAPTIVE_SLEEP_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)