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

Adds the Clear App dialog for Instant Apps

Browse Source 
Adds a confirmation dialog for the user when tapping clear app.

From this dialog the user can either cancel, or confirm they
want to clear the app.

Test: make RunSettingsRoboTests

Bug: 36536695
Change-Id: Idffcf5ef318578ae2e075ea2cbb35323d41acade
This commit is contained in:
Jesse Evans
2017-03-28 19:53:09 -07:00
parent ddf596da14
commit 9209ee53ed
9 changed files with 291 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/com/android/settings/applications/instantapps/InstantAppButtonsController.java
View File

@@ -16,31 +16,53 @@
package com.android.settings.applications.instantapps;
import android.app.AlertDialog;
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppStoreUtil;
import com.android.settings.applications.PackageManagerWrapper;
import com.android.settings.applications.PackageManagerWrapperImpl;
import com.android.settings.overlay.FeatureFactory;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
/** Encapsulates a container for buttons relevant to instant apps */
public class InstantAppButtonsController {
public class InstantAppButtonsController implements DialogInterface.OnClickListener {
public interface ShowDialogDelegate {
/**
* Delegate that should be called when this controller wants to show a dialog.
*/
void showDialog(int id);
}
private final Context mContext;
private final Fragment mFragment;
private final View mView;
private final PackageManagerWrapper mPackageManagerWrapper;
private final ShowDialogDelegate mShowDialogDelegate;
private String mPackageName;
public InstantAppButtonsController(Context context, Fragment fragment, View view) {
public static final int DLG_BASE = 0x5032;
public static final int DLG_CLEAR_APP = DLG_BASE + 1;
public InstantAppButtonsController(
Context context,
Fragment fragment,
View view,
ShowDialogDelegate showDialogDelegate) {
mContext = context;
mFragment = fragment;
mView = view;
mShowDialogDelegate = showDialogDelegate;
mPackageManagerWrapper = new PackageManagerWrapperImpl(context.getPackageManager());
}
public InstantAppButtonsController setPackageName(String packageName) {
@@ -51,17 +73,38 @@ public class InstantAppButtonsController {
public void bindButtons() {
Button installButton = (Button)mView.findViewById(R.id.install);
Button clearDataButton = (Button)mView.findViewById(R.id.clear_data);
Intent installIntent = AppStoreUtil.getAppStoreLink(mContext, mPackageName);
if (installIntent != null) {
Intent appStoreIntent = AppStoreUtil.getAppStoreLink(mContext, mPackageName);
if (appStoreIntent != null) {
installButton.setEnabled(true);
installButton.setOnClickListener(v -> mFragment.startActivity(installIntent));
installButton.setOnClickListener(v -> mFragment.startActivity(appStoreIntent));
}
clearDataButton.setOnClickListener(v -> mShowDialogDelegate.showDialog(DLG_CLEAR_APP));
}
public AlertDialog createDialog(int id) {
if (id == DLG_CLEAR_APP) {
AlertDialog dialog = new AlertDialog.Builder(mFragment.getActivity())
.setPositiveButton(R.string.clear_instant_app_data, this)
.setNegativeButton(R.string.cancel, null)
.setTitle(R.string.clear_instant_app_data)
.setMessage(mContext.getString(R.string.clear_instant_app_confirmation))
.create();
return dialog;
}
return null;
}
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
FeatureFactory.getFactory(mContext)
.getMetricsFeatureProvider()
.action(mContext,
MetricsEvent.ACTION_SETTINGS_CLEAR_INSTANT_APP,
mPackageName);
mPackageManagerWrapper.deletePackageAsUser(
mPackageName, null, 0, UserHandle.myUserId());
}
clearDataButton.setOnClickListener(v -> {
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext,
MetricsEvent.ACTION_SETTINGS_CLEAR_INSTANT_APP, mPackageName);
PackageManager pm = mContext.getPackageManager();
pm.clearApplicationUserData(mPackageName, null);
});
}
public InstantAppButtonsController show() {