diff options
author | Philip P. Moltmann <moltmann@google.com> | 2016-04-11 19:12:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-11 19:12:04 +0000 |
commit | ee50fa56783abed79f747d1fa696f9dc9d914092 (patch) | |
tree | ce90d36a537fd394c4b45091d10602d42e931fc8 /src/com | |
parent | d1dfbf58c8e1a4eaba2bd8218451ff235e59c1ae (diff) | |
parent | 7e1f13d19a5db9c374911160ced2401abda42ad0 (diff) | |
download | android_packages_apps_PackageInstaller-ee50fa56783abed79f747d1fa696f9dc9d914092.tar.gz android_packages_apps_PackageInstaller-ee50fa56783abed79f747d1fa696f9dc9d914092.tar.bz2 android_packages_apps_PackageInstaller-ee50fa56783abed79f747d1fa696f9dc9d914092.zip |
Merge "Apply material design make-over to uninstall path." into nyc-dev
Diffstat (limited to 'src/com')
-rwxr-xr-x | src/com/android/packageinstaller/UninstallAppProgress.java | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/com/android/packageinstaller/UninstallAppProgress.java b/src/com/android/packageinstaller/UninstallAppProgress.java index f1c569a7..dd856796 100755 --- a/src/com/android/packageinstaller/UninstallAppProgress.java +++ b/src/com/android/packageinstaller/UninstallAppProgress.java @@ -62,12 +62,9 @@ public class UninstallAppProgress extends Activity implements OnClickListener { private UserHandle mUser; private IBinder mCallback; - private TextView mStatusTextView; private Button mOkButton; private Button mDeviceManagerButton; private Button mUsersButton; - private ProgressBar mProgressBar; - private View mOkPanel; private volatile int mResultCode = -1; private static final int UNINSTALL_COMPLETE = 1; @@ -202,11 +199,10 @@ public class UninstallAppProgress extends Activity implements OnClickListener { statusText = getString(R.string.uninstall_failed); break; } - mStatusTextView.setText(statusText); - - // Hide the progress bar; Show the ok button - mProgressBar.setVisibility(View.INVISIBLE); - mOkPanel.setVisibility(View.VISIBLE); + findViewById(R.id.progress_view).setVisibility(View.GONE); + findViewById(R.id.status_view).setVisibility(View.VISIBLE); + ((TextView)findViewById(R.id.status_text)).setText(statusText); + findViewById(R.id.ok_panel).setVisibility(View.VISIBLE); break; default: break; @@ -260,8 +256,6 @@ public class UninstallAppProgress extends Activity implements OnClickListener { // Initialize views View snippetView = findViewById(R.id.app_snippet); PackageUtil.initSnippetForInstalledApp(this, mAppInfo, snippetView); - 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); @@ -286,13 +280,9 @@ public class UninstallAppProgress extends Activity implements OnClickListener { finish(); } }); - mProgressBar = (ProgressBar) findViewById(R.id.progress_bar); - mProgressBar.setIndeterminate(true); // Hide button till progress is being displayed - mOkPanel = (View) findViewById(R.id.ok_panel); mOkButton = (Button) findViewById(R.id.ok_button); mOkButton.setOnClickListener(this); - mOkPanel.setVisibility(View.INVISIBLE); IPackageManager packageManager = IPackageManager.Stub.asInterface(ServiceManager.getService("package")); PackageDeleteObserver observer = new PackageDeleteObserver(); |