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

Commit 8f122719 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents 0b9932ea 2c5bf989

res/xml/app_ops_permissions_details.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">



    <SwitchPreference

    <com.android.settings.widget.FilterTouchesSwitchPreference

        android:key="app_ops_settings_switch" />



    <Preference

res/xml/external_sources_details.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

        android:title="@string/install_other_apps">



    <com.android.settingslib.RestrictedSwitchPreference

    <com.android.settings.widget.FilterTouchesRestrictedSwitchPreference

        android:key="external_sources_settings_switch"

        android:title="@string/external_source_switch_title" />

src/com/android/settings/datausage/UnrestrictedDataAccess.java

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ import android.app.Application; 
import android.content.Context;

import android.os.Bundle;

import android.os.UserHandle;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceViewHolder;

import android.view.Menu;
@@ -34,6 +33,7 @@ import com.android.settings.applications.AppStateBaseBridge; 
import com.android.settings.applications.InstalledAppDetails;

import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.FilterTouchesSwitchPreference;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.applications.ApplicationsState.AppEntry;

import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -238,7 +238,8 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment 
        return app != null && UserHandle.isApp(app.info.uid);

    }



    private class AccessPreference extends SwitchPreference implements DataSaverBackend.Listener {

    private class AccessPreference extends FilterTouchesSwitchPreference implements

            DataSaverBackend.Listener {

        private final AppEntry mEntry;

        private final DataUsageState mState;

src/com/android/settings/notification/ZenAccessSettings.java

+4 −3
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import android.os.Looper; 
import android.os.RemoteException;

import android.provider.Settings;

import android.provider.Settings.Secure;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference.OnPreferenceChangeListener;

import android.support.v7.preference.PreferenceScreen;
@@ -55,6 +54,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.FilterTouchesSwitchPreference;



import java.util.ArrayList;

import java.util.Collections;
@@ -135,7 +135,8 @@ public class ZenAccessSettings extends EmptyTextSettings { 
        for (ApplicationInfo app : apps) {

            final String pkg = app.packageName;

            final CharSequence label = app.loadLabel(mPkgMan);

            final SwitchPreference pref = new SwitchPreference(getPrefContext());

            final FilterTouchesSwitchPreference pref = new FilterTouchesSwitchPreference(

                    getPrefContext());

            pref.setPersistent(false);

            pref.setIcon(app.loadIcon(mPkgMan));

            pref.setTitle(label);

src/com/android/settings/utils/ManagedServiceSettings.java

+4 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.content.pm.ServiceInfo; 
import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference.OnPreferenceChangeListener;

import android.support.v7.preference.PreferenceScreen;
@@ -46,6 +45,7 @@ import com.android.settings.R; 
import com.android.settings.Utils;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.notification.EmptyTextSettings;

import com.android.settings.widget.FilterTouchesSwitchPreference;



import java.util.Collections;

import java.util.List;
@@ -127,7 +127,8 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings { 
                Log.e(TAG, "can't find package name", e);

            }

            final String summary = service.loadLabel(mPm).toString();

            final SwitchPreference pref = new SwitchPreference(getPrefContext());

            final FilterTouchesSwitchPreference pref = new FilterTouchesSwitchPreference(

                    getPrefContext());

            pref.setPersistent(false);

            pref.setIcon(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo,

                    UserHandle.getUserId(service.applicationInfo.uid)));