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

Commit dd8c7275 authored by BadDaemon's avatar BadDaemon Committed by Gerrit Code Review
Browse files

Added carrier selection to DataUsageTile 

Sped up how to reach carrier selection:
- Press on CellularTile
-> DetailView opens
- Click on Carrier name

Change-Id: I996552a06754257e43d46c6f782fc238b039d006
(cherry picked from commit 299307b1)
parent e4f8d896

packages/SystemUI/res/layout/data_usage.xml

+2 −1
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ 
        android:layout_height="wrap_content"

        android:orientation="horizontal" >



        <TextView

        <Button

            android:id="@+id/usage_carrier_text"

            style="@style/QSBorderlessButton"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> { 
                    : LayoutInflater.from(mContext).inflate(R.layout.data_usage, parent, false));

            final DataUsageInfo info = mController.getDataUsageInfo();

            if (info == null) return v;

            v.bind(info);

            v.bind(mHost, info);

            return v;

        }

packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java

+20 −2
Original line number Diff line number Diff line
@@ -16,19 +16,24 @@ 


package com.android.systemui.qs.tiles;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.util.AttributeSet;

import android.view.View;

import android.widget.LinearLayout;

import android.widget.TextView;

import android.widget.Button;



import com.android.systemui.FontSizeUtils;

import com.android.systemui.R;

import com.android.systemui.qs.DataUsageGraph;

import com.android.systemui.qs.QSTile;

import com.android.systemui.statusbar.policy.NetworkController;





import java.text.DecimalFormat;



/**
@@ -60,7 +65,8 @@ public class DataUsageDetailView extends LinearLayout { 
                R.dimen.qs_data_usage_text_size);

    }



    public void bind(NetworkController.DataUsageInfo info) {

    public void bind(QSTile.Host host, NetworkController.DataUsageInfo info) {

        final QSTile.Host mHost = host;

        final Resources res = mContext.getResources();

        final int titleId;

        final long bytes;
@@ -99,8 +105,20 @@ public class DataUsageDetailView extends LinearLayout { 
        usage.setTextColor(res.getColor(usageColor));

        final DataUsageGraph graph = (DataUsageGraph) findViewById(R.id.usage_graph);

        graph.setLevels(info.limitLevel, info.warningLevel, info.usageLevel);

        final TextView carrier = (TextView) findViewById(R.id.usage_carrier_text);

        final Button carrier = (Button) findViewById(R.id.usage_carrier_text);

        carrier.setText(info.carrier);

        carrier.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View view) {

                Intent intent = new Intent(Intent.ACTION_MAIN);

                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |

                        Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);

                // Use NetworkSetting to handle the selection intent

                intent.setComponent(new ComponentName("com.android.phone",

                        "com.android.phone.NetworkSetting"));

                mHost.startSettingsActivity(intent);

            }

        });

        final TextView period = (TextView) findViewById(R.id.usage_period_text);

        period.setText(info.period);

        final TextView infoTop = (TextView) findViewById(R.id.usage_info_top_text);