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

Commit a3549a27 authored by Danesh M's avatar Danesh M
Browse files

Settings : Add per app internet/data control 

CYAN-3976
CRACKLING-834

Change-Id: I13192df837c057b5cadde8f31532e12daaf3c1b0
parent f5dea704

res/layout/app_ops_details_item.xml

+35 −46
Original line number Diff line number Diff line
@@ -17,32 +17,32 @@ 
*/

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

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

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

    android:paddingTop="8dip"

    android:paddingBottom="8dip"

    android:columnCount="3">

    android:paddingBottom="8dip">



    <ImageView

        android:id="@+id/op_icon"

        android:layout_width="@android:dimen/app_icon_size"

        android:layout_height="@android:dimen/app_icon_size"

        android:layout_column="0"

        android:layout_row="0"

        android:layout_rowSpan="2"

        android:layout_marginEnd="8dip"

        android:scaleType="centerInside"

        android:contentDescription="@null" />



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="wrap_content">

        <TextView

            android:id="@+id/op_name"

        android:layout_column="1"

        android:layout_row="0"

        android:layout_columnSpan="2"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="fill_horizontal"

            android:layout_marginTop="2dip"

            android:singleLine="true"
@@ -52,9 +52,7 @@ 


        <TextView

            android:id="@+id/op_time"

        android:layout_column="1"

        android:layout_row="1"

        android:layout_width="0dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="fill_horizontal|top"

            android:textAppearance="?android:attr/textAppearanceSmall"
@@ -62,23 +60,19 @@ 


        <TextView

            android:id="@+id/op_counts"

        android:layout_column="1"

        android:layout_row="2"

        android:layout_width="0dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="fill_horizontal|top"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textAlignment="viewStart" />

    </LinearLayout>



    <Spinner

        android:id="@+id/spinnerWidget"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_gravity="end"

        android:layout_marginStart="8dip"

        android:layout_column="2"

        android:layout_row="0"

        android:layout_rowSpan="3"

        android:padding="8dip"

        android:focusable="false"

        android:entries="@+array/app_ops_permissions" />
@@ -87,14 +81,9 @@ 
        android:id="@+id/switchWidget"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_gravity="end"

        android:layout_marginStart="8dip"

        android:layout_column="2"

        android:layout_row="0"

        android:layout_rowSpan="3"

        android:padding="8dip"

        android:focusable="false"

        android:clickable="true" />





</GridLayout>
 
</LinearLayout>

res/layout/preference_category_material.xml

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

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

-->



<!-- Layout used for PreferenceCategory in a PreferenceActivity. -->

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

    android:id="@+android:id/title"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginBottom="16dip"

    android:textAppearance="@*android:style/TextAppearance.Material.Body2"

    android:textColor="@*android:color/preference_category_text_color"

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

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

    android:paddingTop="16dip" />

res/values/cm_strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -1156,4 +1156,10 @@ 
    <string name="battery_info_status_charging_dock_ac">Charging on dock AC</string>

    <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->

    <string name="battery_info_status_charging_dock_usb">Charging over dock USB</string>



    <string name="restrict_app_wlan_title">Disable app wifi usage</string>

    <string name="restrict_app_wlan_summary">Prevent app from using wifi data connection</string>

    <string name="restrict_app_cellular_title">Disable app cellular usage</string>

    <string name="restrict_app_cellular_summary">Prevent app from using cellular data connection</string>

    <string name="privacy_guard_internet_category">Internet</string>

</resources>

src/com/android/settings/applications/AppOpsDetails.java

+52 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.applications;



import android.Manifest;

import android.app.Activity;

import android.app.AppOpsManager;

import android.app.Fragment;
@@ -28,6 +29,7 @@ import android.content.pm.PermissionGroupInfo; 
import android.content.pm.PermissionInfo;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.net.NetworkPolicyManager;

import android.os.Bundle;

import android.util.Log;

import android.view.LayoutInflater;
@@ -49,6 +51,9 @@ import com.android.settings.Utils; 


import java.util.List;



import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_DATA;

import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_WLAN;



public class AppOpsDetails extends InstrumentedFragment {

    static final String TAG = "AppOpsDetails";
@@ -61,6 +66,7 @@ public class AppOpsDetails extends InstrumentedFragment { 
    private LayoutInflater mInflater;

    private View mRootView;

    private LinearLayout mOperationsSection;

    private NetworkPolicyManager mPolicyManager;



    private final int MODE_ALLOWED = 0;

    private final int MODE_IGNORED = 1;
@@ -178,9 +184,9 @@ public class AppOpsDetails extends InstrumentedFragment { 
                        entry.getTimeText(res, true));



                Spinner sp = (Spinner) view.findViewById(R.id.spinnerWidget);

                sp.setVisibility(View.INVISIBLE);

                sp.setVisibility(View.GONE);

                Switch sw = (Switch) view.findViewById(R.id.switchWidget);

                sw.setVisibility(View.INVISIBLE);

                sw.setVisibility(View.GONE);



                final int switchOp = AppOpsManager.opToSwitch(firstOp.getOp());

                int mode = mAppOps.checkOp(switchOp, entry.getPackageOps().getUid(),
@@ -226,9 +232,52 @@ public class AppOpsDetails extends InstrumentedFragment { 
            }

        }



        if (mPm.checkPermission(Manifest.permission.INTERNET, mPackageInfo.packageName)

                == PackageManager.PERMISSION_GRANTED) {

            TextView internetCategory = (TextView) mInflater.inflate(

                    R.layout.preference_category_material, null);

            internetCategory.setText(R.string.privacy_guard_internet_category);

            mOperationsSection.addView(internetCategory);



            addInternetSwitch(POLICY_REJECT_ON_WLAN);

            addInternetSwitch(POLICY_REJECT_ON_DATA);

        }



        return true;

    }



    private void addInternetSwitch(final int policy) {

        // Add internet category permissions

        final View view = mInflater.inflate(R.layout.app_ops_details_item,

                mOperationsSection, false);

        mOperationsSection.addView(view);



        ((TextView)view.findViewById(R.id.op_name)).setText(

                policy == POLICY_REJECT_ON_DATA ? R.string.restrict_app_cellular_title :

                        R.string.restrict_app_wlan_title);

        view.findViewById(R.id.op_counts).setVisibility(View.INVISIBLE);

        view.findViewById(R.id.op_time).setVisibility(View.INVISIBLE);

        view.findViewById(R.id.spinnerWidget).setVisibility(View.GONE);



        Switch sw = (Switch) view.findViewById(R.id.switchWidget);

        sw.setChecked((mPolicyManager.getUidPolicy(

                mPackageInfo.applicationInfo.uid) & policy) != 0);

        sw.setTag(policy);

        sw.setVisibility(View.VISIBLE);

        sw.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener() {

            public void onCheckedChanged(CompoundButton buttonView,

                                         boolean isChecked) {

                if (isChecked) {

                    mPolicyManager.addUidPolicy(mPackageInfo.applicationInfo.uid,

                            policy);

                } else {

                    mPolicyManager.removeUidPolicy(mPackageInfo.applicationInfo.uid,

                            policy);

                }

            }

        });

    }



    private void setIntentAndFinish(boolean finish, boolean appChanged) {

        Intent intent = new Intent();

        intent.putExtra(ManageApplications.APP_CHG, appChanged);
@@ -245,6 +294,7 @@ public class AppOpsDetails extends InstrumentedFragment { 
        mPm = getActivity().getPackageManager();

        mInflater = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);

        mAppOps = (AppOpsManager)getActivity().getSystemService(Context.APP_OPS_SERVICE);

        mPolicyManager = NetworkPolicyManager.from(getActivity());



        retrieveAppEntry();

src/com/android/settings/privacyguard/AppInfoLoader.java

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.settings.privacyguard;



import android.Manifest;

import android.app.AppOpsManager;

import android.content.AsyncTaskLoader;

import android.content.Context;
@@ -104,6 +105,8 @@ import java.util.List; 
            app.uid = info.applicationInfo.uid;

            app.privacyGuardEnabled = mAppOps.getPrivacyGuardSettingForPackage(

                    app.uid, app.packageName);

            app.hasInternetPermission = mPm.checkPermission(Manifest.permission.INTERNET,

                    app.packageName) == PackageManager.PERMISSION_GRANTED;

            apps.add(app);

        }