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

Commit e388d09d authored by Fang Yunong's avatar Fang Yunong Committed by Linux Build Service Account
Browse files

FR33283:QGP-TMO: Data usage for video calls 

Settings:add phone icon to the  data usage list,
and open WLAN show list;

Change-Id: I512b5c5acd048a7bad957adb16972cf159e7aa47
CRs-Fixed: 1039373
parent 353e52ee

res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -46,4 +46,6 @@ 
    <!-- When true enable color temperature setting. -->

    <bool name="config_enableColorTemperature">false</bool>



    <bool name="config_video_call_datausage_enable">false</bool>



</resources>

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

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ import android.app.ActivityManager; 
import android.app.LoaderManager.LoaderCallbacks;

import android.content.Context;

import android.content.Loader;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.graphics.Color;

import android.net.ConnectivityManager;
@@ -400,6 +402,14 @@ public class DataUsageList extends DataUsageBase { 
        final List<UserHandle> profiles = userManager.getUserProfiles();

        final SparseArray<AppItem> knownItems = new SparseArray<AppItem>();



        PackageManager pm = getContext().getPackageManager();

        ApplicationInfo ai = null;

        try{

            ai = pm.getApplicationInfo("com.android.dialer", PackageManager.GET_ACTIVITIES);

         } catch(Exception e) {

           Log.d(TAG, "get dialer getApplicationInfo failed " + e);

        }



        NetworkStats.Entry entry = null;

        final int size = stats != null ? stats.size() : 0;

        for (int i = 0; i < size; i++) {
@@ -437,6 +447,10 @@ public class DataUsageList extends DataUsageBase { 
            } else if (uid == UID_REMOVED || uid == UID_TETHERING) {

                collapseKey = uid;

                category = AppItem.CATEGORY_APP;

            } else if ((ai != null) && (uid == ai.uid) && getContext().getResources().getBoolean(

                    R.bool.config_video_call_datausage_enable)){

                collapseKey = uid;

                category = AppItem.CATEGORY_APP;

            } else {

                collapseKey = android.os.Process.SYSTEM_UID;

                category = AppItem.CATEGORY_APP;