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.4 KiB
Java
100 lines
3.4 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;
|
|
|
|
import android.content.Context;
|
|
import android.support.v7.preference.Preference;
|
|
import android.support.v7.preference.PreferenceViewHolder;
|
|
import android.text.TextUtils;
|
|
import android.util.AttributeSet;
|
|
import android.view.View;
|
|
import android.widget.TextView;
|
|
import com.android.settings.applications.LinearColorBar;
|
|
|
|
/**
|
|
* Provides a summary of a setting page in a preference. Such as memory or data usage.
|
|
*/
|
|
public class SummaryPreference extends Preference {
|
|
|
|
private static final String TAG = "SummaryPreference";
|
|
private String mAmount;
|
|
private String mUnits;
|
|
|
|
private int mLeft, mMiddle, mRight;
|
|
private float mLeftRatio, mMiddleRatio, mRightRatio;
|
|
private String mStartLabel;
|
|
private String mEndLabel;
|
|
|
|
public SummaryPreference(Context context, AttributeSet attrs) {
|
|
super(context, attrs);
|
|
setLayoutResource(R.layout.settings_summary_preference);
|
|
mLeft = context.getColor(R.color.summary_default_start);
|
|
mRight = context.getColor(R.color.summary_default_end);
|
|
}
|
|
|
|
public void setAmount(String amount) {
|
|
mAmount = amount;
|
|
if (mAmount != null && mUnits != null) {
|
|
setTitle(TextUtils.expandTemplate(getContext().getText(R.string.storage_size_large),
|
|
mAmount, mUnits));
|
|
}
|
|
}
|
|
|
|
public void setUnits(String units) {
|
|
mUnits = units;
|
|
if (mAmount != null && mUnits != null) {
|
|
setTitle(TextUtils.expandTemplate(getContext().getText(R.string.storage_size_large),
|
|
mAmount, mUnits));
|
|
}
|
|
}
|
|
|
|
public void setLabels(String start, String end) {
|
|
mStartLabel = start;
|
|
mEndLabel = end;
|
|
notifyChanged();
|
|
}
|
|
|
|
public void setRatios(float left, float middle, float right) {
|
|
mLeftRatio = left;
|
|
mMiddleRatio = middle;
|
|
mRightRatio = right;
|
|
notifyChanged();
|
|
}
|
|
|
|
public void setColors(int left, int middle, int right) {
|
|
mLeft = left;
|
|
mMiddle = middle;
|
|
mRight = right;
|
|
notifyChanged();
|
|
}
|
|
|
|
@Override
|
|
public void onBindViewHolder(PreferenceViewHolder holder) {
|
|
super.onBindViewHolder(holder);
|
|
|
|
LinearColorBar colorBar = (LinearColorBar) holder.itemView.findViewById(R.id.color_bar);
|
|
colorBar.setRatios(mLeftRatio, mMiddleRatio, mRightRatio);
|
|
colorBar.setColors(mLeft, mMiddle, mRight);
|
|
|
|
if (!TextUtils.isEmpty(mStartLabel) || !TextUtils.isEmpty(mEndLabel)) {
|
|
holder.findViewById(R.id.label_bar).setVisibility(View.VISIBLE);
|
|
((TextView) holder.findViewById(android.R.id.text1)).setText(mStartLabel);
|
|
((TextView) holder.findViewById(android.R.id.text2)).setText(mEndLabel);
|
|
} else {
|
|
holder.findViewById(R.id.label_bar).setVisibility(View.GONE);
|
|
}
|
|
}
|
|
}
|