From 10f852cba8be8b26c9f4f7c0aa57aab01f19c3c1 Mon Sep 17 00:00:00 2001
From: Fyodor Kupolov <fkupolov@google.com>
Date: Wed, 9 Mar 2016 14:55:23 -0800
Subject: Added "Manage users" button

Show "Manage users" button when a secondary user is blocking the uninstall.

Bug: 24616123
Change-Id: I61f1d9814dccc9f9e8acbce97d8ef681f5ec8944
---
 src/com/android/packageinstaller/UninstallAppProgress.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src')

diff --git a/src/com/android/packageinstaller/UninstallAppProgress.java b/src/com/android/packageinstaller/UninstallAppProgress.java
index 4c039051..f1c569a7 100755
--- a/src/com/android/packageinstaller/UninstallAppProgress.java
+++ b/src/com/android/packageinstaller/UninstallAppProgress.java
@@ -35,6 +35,7 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -64,6 +65,7 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
     private TextView mStatusTextView;
     private Button mOkButton;
     private Button mDeviceManagerButton;
+    private Button mUsersButton;
     private ProgressBar mProgressBar;
     private View mOkPanel;
     private volatile int mResultCode = -1;
@@ -180,6 +182,7 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
                                 mDeviceManagerButton.setVisibility(View.VISIBLE);
                             } else {
                                 mDeviceManagerButton.setVisibility(View.GONE);
+                                mUsersButton.setVisibility(View.VISIBLE);
                             }
                             // TODO: b/25442806
                             if (blockingUserId == UserHandle.USER_SYSTEM) {
@@ -260,6 +263,7 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
         mStatusTextView = (TextView) findViewById(R.id.center_text);
         mStatusTextView.setText(R.string.uninstalling);
         mDeviceManagerButton = (Button) findViewById(R.id.device_manager_button);
+        mUsersButton = (Button) findViewById(R.id.users_button);
         mDeviceManagerButton.setVisibility(View.GONE);
         mDeviceManagerButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -272,6 +276,16 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
                 finish();
             }
         });
+        mUsersButton.setVisibility(View.GONE);
+        mUsersButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(Settings.ACTION_USER_SETTINGS);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+                finish();
+            }
+        });
         mProgressBar = (ProgressBar) findViewById(R.id.progress_bar);
         mProgressBar.setIndeterminate(true);
         // Hide button till progress is being displayed
-- 
cgit v1.2.3