b37e2887d3
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
102 lines
4.0 KiB
Java
102 lines
4.0 KiB
Java
/*
|
|
* Copyright (C) 2015 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.app.Activity;
|
|
import android.app.Fragment;
|
|
import android.content.Intent;
|
|
import android.content.res.ColorStateList;
|
|
import android.graphics.drawable.Drawable;
|
|
import android.os.Bundle;
|
|
import android.view.View;
|
|
import android.view.View.OnClickListener;
|
|
import android.view.ViewGroup;
|
|
import android.widget.ImageView;
|
|
import android.widget.TextView;
|
|
|
|
import com.android.settings.applications.AppInfoBase;
|
|
import com.android.settings.applications.InstalledAppDetails;
|
|
|
|
public class AppHeader {
|
|
|
|
public static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
|
|
// constant value that can be used to check return code from sub activity.
|
|
private static final int INSTALLED_APP_DETAILS = 1;
|
|
|
|
public static void createAppHeader(SettingsPreferenceFragment fragment, Drawable icon,
|
|
CharSequence label, String pkgName, int uid) {
|
|
createAppHeader(fragment, icon, label, pkgName, uid, 0);
|
|
}
|
|
|
|
public static void createAppHeader(Activity activity, Drawable icon, CharSequence label,
|
|
String pkgName, int uid, ViewGroup pinnedHeader) {
|
|
final View bar = activity.getLayoutInflater().inflate(R.layout.app_header,
|
|
pinnedHeader, false);
|
|
setupHeaderView(activity, icon, label, pkgName, uid, false, 0, bar);
|
|
pinnedHeader.addView(bar);
|
|
}
|
|
|
|
public static void createAppHeader(SettingsPreferenceFragment fragment, Drawable icon,
|
|
CharSequence label, String pkgName, int uid, int tintColorRes) {
|
|
View bar = fragment.setPinnedHeaderView(R.layout.app_header);
|
|
setupHeaderView(fragment.getActivity(), icon, label, pkgName, uid, includeAppInfo(fragment),
|
|
tintColorRes, bar);
|
|
}
|
|
|
|
public static View setupHeaderView(final Activity activity, Drawable icon, CharSequence label,
|
|
final String pkgName, final int uid, boolean includeAppInfo, int tintColorRes,
|
|
View bar) {
|
|
final ImageView appIcon = (ImageView) bar.findViewById(R.id.app_icon);
|
|
appIcon.setImageDrawable(icon);
|
|
if (tintColorRes != 0) {
|
|
appIcon.setImageTintList(ColorStateList.valueOf(activity.getColor(tintColorRes)));
|
|
}
|
|
|
|
final TextView appName = (TextView) bar.findViewById(R.id.app_name);
|
|
appName.setText(label);
|
|
|
|
final View appSettings = bar.findViewById(R.id.app_settings);
|
|
if (includeAppInfo && pkgName != null && !pkgName.equals(Utils.OS_PKG)) {
|
|
appSettings.setClickable(true);
|
|
appSettings.setOnClickListener(new OnClickListener() {
|
|
@Override
|
|
public void onClick(View v) {
|
|
AppInfoBase.startAppInfoFragment(InstalledAppDetails.class,
|
|
R.string.application_info_label, pkgName, uid, activity,
|
|
INSTALLED_APP_DETAILS);
|
|
}
|
|
});
|
|
} else {
|
|
appSettings.setVisibility(View.GONE);
|
|
}
|
|
return bar;
|
|
}
|
|
|
|
public static boolean includeAppInfo(final Fragment fragment) {
|
|
Bundle args = fragment.getArguments();
|
|
boolean showInfo = true;
|
|
if (args != null && args.getBoolean(EXTRA_HIDE_INFO_BUTTON, false)) {
|
|
showInfo = false;
|
|
}
|
|
Intent intent = fragment.getActivity().getIntent();
|
|
if (intent != null && intent.getBooleanExtra(EXTRA_HIDE_INFO_BUTTON, false)) {
|
|
showInfo = false;
|
|
}
|
|
return showInfo;
|
|
}
|
|
}
|