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

Commit 78c66569 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refactor AppPreference and AppSwitchPreference"

parents 5d34370e fc02ce1c

src/com/android/settings/accounts/AccountTypePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import androidx.preference.Preference.OnPreferenceClickListener; 


import com.android.settings.Utils;

import com.android.settings.core.SubSettingLauncher;

import com.android.settingslib.widget.apppreference.AppPreference;

import com.android.settingslib.widget.AppPreference;



public class AccountTypePreference extends AppPreference implements OnPreferenceClickListener {

    /**

src/com/android/settings/applications/ProcessStatsPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.text.TextUtils; 
import android.text.format.Formatter;

import android.util.Log;



import com.android.settingslib.widget.apppreference.AppPreference;

import com.android.settingslib.widget.AppPreference;



public class ProcessStatsPreference extends AppPreference {

    static final String TAG = "ProcessStatsPreference";

src/com/android/settings/applications/managedomainurls/DomainAppPreference.java

+1 −4
Original line number Diff line number Diff line
@@ -21,14 +21,11 @@ import android.content.pm.PackageManager; 
import android.os.UserHandle;

import android.util.ArraySet;

import android.util.IconDrawableFactory;

import android.view.View;



import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;

import com.android.settings.Utils;

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

import com.android.settingslib.widget.apppreference.AppPreference;

import com.android.settingslib.widget.AppPreference;



public class DomainAppPreference extends AppPreference {

src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ import androidx.preference.PreferenceScreen; 


import com.android.settings.core.BasePreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.AppSwitchPreference;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;

import com.android.settingslib.widget.AppSwitchPreference;

import com.android.settingslib.widget.FooterPreference;



import org.xmlpull.v1.XmlPullParserException;

src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import com.android.settings.applications.AppInfoBase; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.EmptyTextSettings;

import com.android.settingslib.search.SearchIndexable;

import com.android.settingslib.widget.apppreference.AppPreference;

import com.android.settingslib.widget.AppPreference;



import java.util.ArrayList;

import java.util.List;