Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a69c6a authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fa 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548

Change-Id: I92dbf184a274d3a22ad597bff0b24d2c44218266
parents 6cc261d7 f116c5fa

res/xml/power_usage_summary.xml

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ 
        android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"

        android:key="battery_saver_summary"

        android:title="@string/battery_saver"

        settings:controller="com.android.settings.fuelgauge.BatterySaverController"

        settings:platform_slice="true" />

        settings:controller="com.android.settings.fuelgauge.BatterySaverController" />



    <Preference

        android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"

src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java

+13 −0
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/network/AirplaneModePreferenceController.java

+17 −0
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/panel/InternetConnectivityPanel.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }

src/com/android/settings/slices/CustomSliceRegistry.java

+1 −11
Original line number Diff line number Diff line
@@ -58,16 +58,6 @@ 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

     */