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

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

Merge "Remove obsolete chart view widgets."

parents dd2908d5 8e208c65

color-check-baseline.xml

+0 −16
Original line number Diff line number Diff line
@@ -1501,22 +1501,6 @@ 
            column="9"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="        settings:fillColorSecondary=&quot;#ff80cbc4&quot;"

        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/layout/data_usage_chart.xml"

            line="47"

            column="9"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

res/layout/data_usage_chart.xml

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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.

-->



<!-- NOTE: this explicitly uses right/left padding, since the

     graph isn't swapped in RTL languages -->

<com.android.settings.widget.ChartDataUsageView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

    android:id="@+id/chart"

    android:layout_width="match_parent"

    android:layout_height="@dimen/data_usage_chart_height"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="16dp"

    android:paddingBottom="24dp">



    <com.android.settings.widget.ChartGridView

        android:id="@+id/grid"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="start|bottom"

        android:paddingBottom="24dp"

        android:textColor="?android:attr/textColorPrimary"

        android:textAppearance="@android:style/TextAppearance.Material.Caption"

        settings:borderDrawable="@drawable/data_grid_border" />



    <com.android.settings.widget.ChartNetworkSeriesView

        android:id="@+id/series"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="start|bottom"

        settings:strokeColor="#00000000"

        settings:fillColor="?android:attr/colorAccent"

        settings:fillColorSecondary="#ff80cbc4"

        settings:safeRegion="3dp" />



    <com.android.settings.widget.ChartNetworkSeriesView

        android:id="@+id/detail_series"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="start|bottom"

        settings:strokeColor="#00000000"

        settings:fillColor="?android:attr/colorAccent"

        settings:fillColorSecondary="?android:attr/colorAccent"

        settings:safeRegion="3dp" />



    <com.android.settings.widget.ChartSweepView

        android:id="@+id/sweep_warning"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:nextFocusUp="@+id/sweep_limit"

        settings:sweepDrawable="@drawable/data_sweep_warning"

        settings:followAxis="vertical"

        settings:neighborMargin="5dip"

        settings:labelSize="60dip"

        settings:labelTemplate="@string/data_usage_sweep_warning"

        settings:labelColor="?android:attr/textColorSecondary"

        settings:safeRegion="4dp" />



    <com.android.settings.widget.ChartSweepView

        android:id="@+id/sweep_limit"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:nextFocusDown="@+id/sweep_warning"

        settings:sweepDrawable="@drawable/data_sweep_limit"

        settings:followAxis="vertical"

        settings:neighborMargin="5dip"

        settings:labelSize="60dip"

        settings:labelTemplate="@string/data_usage_sweep_limit"

        settings:labelColor="?android:attr/colorError"

        settings:safeRegion="4dp" />



</com.android.settings.widget.ChartDataUsageView>

res/values/attrs.xml

+0 −7
Original line number Diff line number Diff line
@@ -50,13 +50,6 @@ 
        <attr name="android:textAppearance" />

    </declare-styleable>



    <declare-styleable name="ChartNetworkSeriesView">

        <attr name="strokeColor" format="color" />

        <attr name="fillColor" format="color" />

        <attr name="fillColorSecondary" format="color" />

        <attr name="safeRegion" />

    </declare-styleable>



    <attr name="apnPreferenceStyle" format="reference" />



    <attr name="footerPreferenceStyle" format="reference" />

src/com/android/settings/datausage/DataUsageList.java

+0 −5
Original line number Diff line number Diff line
@@ -14,18 +14,15 @@ 


package com.android.settings.datausage;



import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

import static android.net.TrafficStats.UID_REMOVED;

import static android.net.TrafficStats.UID_TETHERING;

import static android.telephony.TelephonyManager.SIM_STATE_READY;



import android.app.ActivityManager;

import android.content.Context;

import android.content.Intent;

import android.content.pm.UserInfo;

import android.graphics.Color;

import android.net.ConnectivityManager;

import android.net.INetworkStatsSession;

import android.net.NetworkPolicy;

import android.net.NetworkStats;
@@ -35,13 +32,11 @@ import android.net.TrafficStats; 
import android.os.AsyncTask;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.format.DateUtils;

import android.util.Log;

import android.util.SparseArray;

src/com/android/settings/datausage/DataUsageListV2.java

+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.content.pm.UserInfo; 
import android.graphics.Color;

import android.net.ConnectivityManager;

import android.net.NetworkPolicy;

import android.net.NetworkStatsHistory;

import android.net.NetworkTemplate;

import android.os.AsyncTask;

import android.os.Bundle;
@@ -252,8 +251,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment { 
    }



    /**

     * Update body content based on current tab. Loads

     * {@link NetworkStatsHistory} and {@link NetworkPolicy} from system, and

     * Update body content based on current tab. Loads network cycle data from system, and

     * binds them to visible controls.

     */

    private void updateBody() {