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

Commit 4e064343 authored by Jeff Davidson's avatar Jeff Davidson Committed by Android (Google) Code Review
Browse files

Merge "Less intrusive VPN dialog." into lmp-dev

parents e847e7ef 90b3b211

res/values/arrays.xml

+2 −0
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ 
        <item>get usage stats</item>

        <item>mute/unmute microphone</item>

        <item>project media</item>

        <item>activate VPN</item>

    </string-array>



    <!-- User display names for app ops codes -->
@@ -696,6 +697,7 @@ 
        <item>Get usage stats</item>

        <item>Mute/unmute microphone</item>

        <item>Project media</item>

        <item>Activate VPN</item>

    </string-array>



    <!-- Titles for the list of long press timeout options. -->

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

+3 −1
Original line number Diff line number Diff line
@@ -190,13 +190,15 @@ public class AppOpsState { 
                    AppOpsManager.OP_WRITE_SETTINGS,

                    AppOpsManager.OP_SYSTEM_ALERT_WINDOW,

                    AppOpsManager.OP_WAKE_LOCK,

                    AppOpsManager.OP_PROJECT_MEDIA },

                    AppOpsManager.OP_PROJECT_MEDIA,

                    AppOpsManager.OP_ACTIVATE_VPN, },

            new boolean[] { false,

                    true,

                    true,

                    true,

                    true,

                    true,

                    false,

                    false, }

            );

src/com/android/settings/vpn2/VpnSettings.java

+2 −10
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ import android.view.MenuInflater; 
import android.view.MenuItem;

import android.view.View;

import android.widget.AdapterView.AdapterContextMenuInfo;

import android.widget.AdapterView.OnItemSelectedListener;

import android.widget.ArrayAdapter;

import android.widget.ListView;

import android.widget.Spinner;

import android.widget.TextView;

import android.widget.Toast;
@@ -56,7 +58,6 @@ import com.android.internal.net.VpnProfile; 
import com.android.internal.util.ArrayUtils;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;



import com.google.android.collect.Lists;



import java.util.ArrayList;
@@ -349,15 +350,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements 


        if (preference instanceof VpnPreference) {

            VpnProfile profile = ((VpnPreference) preference).getProfile();

            if (mInfo != null && profile.key.equals(mInfo.key) &&

                    mInfo.state == LegacyVpnInfo.STATE_CONNECTED) {

                try {

                    mInfo.intent.send();

                    return true;

                } catch (Exception e) {

                    // ignore

                }

            }

            mDialog = new VpnDialog(getActivity(), this, profile, false);

        } else {

            // Generate a new key. Here we just use the current time.