Update the UX and dig the data usage screen out of a huge whole of technical debt. Switch every to use Preferences rather than standard layouts and ListViews. Split data usage into several fragments, all separated. DataUsageSummary: - Shows a summary of the 'default' usage at the top, this will be the default sim on phones, or wifi if it has it, or ethernet as last attempt to show something. - Also has individual categories for each network type that has data, cell, wifi, and ethernet. Maybe should look into bt though? DataUsageList: - Takes a NetworkTemplate as an input, and can only be reached from the network specific categories in DataUsageSummary - Shows a graph of current usage for that network and links to app detail page for any app. - Has gear link to quick get to billing cycle screen if available BillingCycleSettings: - Just a screen with the cycle day and warning/limits separated out from the data usage. AppDataUsage: - App specific data usage details - May need some UX iteration given lack of clarity in the spec Bug: 22459566 Change-Id: I0222d8d7ea7b75a9775207a6026ebbdcce8f5e46
100 lines
3.5 KiB
Java
100 lines
3.5 KiB
Java
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software distributed under the
|
|
* License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the specific language governing
|
|
* permissions and limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.datausage;
|
|
|
|
import android.app.AlertDialog;
|
|
import android.content.Context;
|
|
import android.content.DialogInterface;
|
|
import android.net.NetworkPolicyManager;
|
|
import android.support.v7.preference.PreferenceViewHolder;
|
|
import android.util.AttributeSet;
|
|
import android.view.View;
|
|
import android.widget.Checkable;
|
|
import com.android.settings.CustomDialogPreference;
|
|
import com.android.settings.R;
|
|
import com.android.settings.Utils;
|
|
import com.android.settings.dashboard.conditional.BackgroundDataCondition;
|
|
import com.android.settings.dashboard.conditional.ConditionManager;
|
|
|
|
public class RestrictBackgroundDataPreference extends CustomDialogPreference {
|
|
|
|
private NetworkPolicyManager mPolicyManager;
|
|
private boolean mChecked;
|
|
|
|
public RestrictBackgroundDataPreference(Context context, AttributeSet attrs) {
|
|
super(context, attrs, android.R.attr.switchPreferenceStyle);
|
|
}
|
|
|
|
@Override
|
|
public void onAttached() {
|
|
super.onAttached();
|
|
mPolicyManager = NetworkPolicyManager.from(getContext());
|
|
setChecked(mPolicyManager.getRestrictBackground());
|
|
}
|
|
|
|
public void setRestrictBackground(boolean restrictBackground) {
|
|
mPolicyManager.setRestrictBackground(restrictBackground);
|
|
setChecked(restrictBackground);
|
|
ConditionManager.get(getContext()).getCondition(BackgroundDataCondition.class)
|
|
.refreshState();
|
|
}
|
|
|
|
private void setChecked(boolean checked) {
|
|
if (mChecked == checked) return;
|
|
mChecked = checked;
|
|
notifyChanged();
|
|
}
|
|
|
|
@Override
|
|
public void onBindViewHolder(PreferenceViewHolder holder) {
|
|
super.onBindViewHolder(holder);
|
|
View switchView = holder.findViewById(android.R.id.switch_widget);
|
|
switchView.setClickable(false);
|
|
((Checkable) switchView).setChecked(mChecked);
|
|
}
|
|
|
|
@Override
|
|
protected void performClick(View view) {
|
|
if (mChecked) {
|
|
setRestrictBackground(false);
|
|
} else {
|
|
super.performClick(view);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
|
|
DialogInterface.OnClickListener listener) {
|
|
super.onPrepareDialogBuilder(builder, listener);
|
|
builder.setTitle(R.string.data_usage_restrict_background_title);
|
|
if (Utils.hasMultipleUsers(getContext())) {
|
|
builder.setMessage(R.string.data_usage_restrict_background_multiuser);
|
|
} else {
|
|
builder.setMessage(R.string.data_usage_restrict_background);
|
|
}
|
|
|
|
builder.setPositiveButton(android.R.string.ok, listener);
|
|
builder.setNegativeButton(android.R.string.cancel, null);
|
|
}
|
|
|
|
@Override
|
|
protected void onClick(DialogInterface dialog, int which) {
|
|
if (which != DialogInterface.BUTTON_POSITIVE) {
|
|
return;
|
|
}
|
|
setRestrictBackground(true);
|
|
}
|
|
}
|