Switch to use small icon for most app related pages
- Renamed AppProgressPreference to AppPreference to handle most app related prefs - Add ed AppSwitchPreference - the same layout as AppPreference except it's a SwitchPreference - Use above 2 prefs in most app related pages. - Everything under special access pages - Recent app list in App & notifications - App data usage detail page - Default app picker pages Bug: 65182905 Test: robotests Change-Id: I96c980ba1db49e36dabe25b5eade1197215aad11
This commit is contained in:
@@ -15,19 +15,18 @@
|
||||
package com.android.settings.datausage;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceViewHolder;
|
||||
import android.text.format.Formatter;
|
||||
import android.view.View;
|
||||
import android.widget.ProgressBar;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.widget.AppPreference;
|
||||
import com.android.settingslib.AppItem;
|
||||
import com.android.settingslib.net.UidDetail;
|
||||
import com.android.settingslib.net.UidDetailProvider;
|
||||
import com.android.settingslib.utils.ThreadUtils;
|
||||
|
||||
public class AppDataUsagePreference extends Preference {
|
||||
public class AppDataUsagePreference extends AppPreference {
|
||||
|
||||
private final AppItem mItem;
|
||||
private final int mPercent;
|
||||
@@ -38,8 +37,6 @@ public class AppDataUsagePreference extends Preference {
|
||||
super(context);
|
||||
mItem = item;
|
||||
mPercent = percent;
|
||||
setLayoutResource(R.layout.preference_app);
|
||||
setWidgetLayoutResource(R.layout.widget_progress_bar);
|
||||
|
||||
if (item.restricted && item.total <= 0) {
|
||||
setSummary(com.android.settings.R.string.data_usage_app_restricted);
|
||||
@@ -60,7 +57,6 @@ public class AppDataUsagePreference extends Preference {
|
||||
@Override
|
||||
public void onBindViewHolder(PreferenceViewHolder holder) {
|
||||
super.onBindViewHolder(holder);
|
||||
|
||||
final ProgressBar progress = (ProgressBar) holder.findViewById(
|
||||
android.R.id.progress);
|
||||
|
||||
|
@@ -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.AppSwitchPreference;
|
||||
import com.android.settingslib.applications.ApplicationsState;
|
||||
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||
import com.android.settingslib.applications.ApplicationsState.AppFilter;
|
||||
@@ -59,11 +59,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
|
||||
public void onCreate(Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
setAnimationAllowed(true);
|
||||
if (usePreferenceScreenTitle()) {
|
||||
addPreferencesFromResource(R.xml.unrestricted_data_access_settings);
|
||||
} else {
|
||||
setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
|
||||
}
|
||||
addPreferencesFromResource(R.xml.unrestricted_data_access_settings);
|
||||
mApplicationsState = ApplicationsState.getInstance(
|
||||
(Application) getContext().getApplicationContext());
|
||||
mDataSaverBackend = new DataSaverBackend(getContext());
|
||||
@@ -239,7 +235,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 AppSwitchPreference
|
||||
implements DataSaverBackend.Listener {
|
||||
private final AppEntry mEntry;
|
||||
private final DataUsageState mState;
|
||||
|
||||
|
Reference in New Issue
Block a user