PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't show vpn info box when we don't have anything useful" into oc-dev

Browse Source 
am: d70abb53ee

Change-Id: I98af02698f46eb483cf5d64380854dd632d26113
This commit is contained in:
Fan Zhang
2017-04-11 23:43:01 +00:00
committed by android-build-merger
parent 668dae22e7 d70abb53ee
commit 007b9e3cdd
2 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/vpn2/AppDialogFragment.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.vpn2;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
@@ -67,13 +66,18 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
public static void show(Fragment parent, PackageInfo packageInfo, String label,
boolean managing, boolean connected) {
if (!managing && !connected) {
// We can't display anything useful for this case.
return;
}
show(parent, null, packageInfo, label, managing, connected);
}
public static void show(Fragment parent, Listener listener, PackageInfo packageInfo,
String label, boolean managing, boolean connected) {
if (!parent.isAdded())
if (!parent.isAdded()) {
return;
}
Bundle args = new Bundle();
args.putParcelable(ARG_PACKAGE, packageInfo);
@@ -100,7 +104,7 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
final String label = args.getString(ARG_LABEL);
boolean managing = args.getBoolean(ARG_MANAGING);
boolean connected = args.getBoolean(ARG_CONNECTED);
mPackageInfo = (PackageInfo) args.getParcelable(ARG_PACKAGE);
mPackageInfo = args.getParcelable(ARG_PACKAGE);
if (managing) {
return new AppDialog(getActivity(), this, mPackageInfo, label);