diff options
author | Philip P. Moltmann <moltmann@google.com> | 2016-04-06 16:12:01 -0700 |
---|---|---|
committer | Philip P. Moltmann <moltmann@google.com> | 2016-04-07 17:28:16 -0700 |
commit | db783edf34ff3d228b9a5d5b14b0bf1e966ebd34 (patch) | |
tree | 9321114b48e9c2ca3563a1db54a35e24b4c47ae7 /src | |
parent | 0a25ee021bd0a68c59c0d4b5e2352c4cb2fdea83 (diff) | |
download | android_packages_apps_PackageInstaller-db783edf34ff3d228b9a5d5b14b0bf1e966ebd34.tar.gz android_packages_apps_PackageInstaller-db783edf34ff3d228b9a5d5b14b0bf1e966ebd34.tar.bz2 android_packages_apps_PackageInstaller-db783edf34ff3d228b9a5d5b14b0bf1e966ebd34.zip |
Make side-load install path material design-y
Bug: 26932948
Change-Id: Ic8bcec523fc6cd0db847a4575724fbe465e65c5d
Diffstat (limited to 'src')
-rwxr-xr-x | src/com/android/packageinstaller/InstallAppProgress.java | 32 | ||||
-rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 4 |
2 files changed, 15 insertions, 21 deletions
diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java index d40d84d9..6b8994f6 100755 --- a/src/com/android/packageinstaller/InstallAppProgress.java +++ b/src/com/android/packageinstaller/InstallAppProgress.java @@ -44,6 +44,7 @@ import android.os.Message; import android.util.Log; import android.view.View; import android.widget.Button; +import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; @@ -99,15 +100,14 @@ public class InstallAppProgress extends Activity implements View.OnClickListener return; } // Update the status text - mProgressBar.setVisibility(View.INVISIBLE); + mProgressBar.setVisibility(View.GONE); // Show the ok button int centerTextLabel; int centerExplanationLabel = -1; - LevelListDrawable centerTextDrawable = - (LevelListDrawable) getDrawable(R.drawable.ic_result_status); if (msg.arg1 == PackageInstaller.STATUS_SUCCESS) { mLaunchButton.setVisibility(View.VISIBLE); - centerTextDrawable.setLevel(0); + ((ImageView)findViewById(R.id.center_icon)) + .setImageDrawable(getDrawable(R.drawable.ic_done_92)); centerTextLabel = R.string.install_done; // Enable or disable launch button mLaunchIntent = getPackageManager().getLaunchIntentForPackage( @@ -130,24 +130,21 @@ public class InstallAppProgress extends Activity implements View.OnClickListener return; } else { // Generic error handling for all other error codes. - centerTextDrawable.setLevel(1); + ((ImageView)findViewById(R.id.center_icon)) + .setImageDrawable(getDrawable(R.drawable.ic_report_problem_92)); centerExplanationLabel = getExplanationFromErrorCode(msg.arg1); centerTextLabel = R.string.install_failed; - mLaunchButton.setVisibility(View.INVISIBLE); + mLaunchButton.setVisibility(View.GONE); } - if (centerTextDrawable != null) { - centerTextDrawable.setBounds(0, 0, - centerTextDrawable.getIntrinsicWidth(), - centerTextDrawable.getIntrinsicHeight()); - mStatusTextView.setCompoundDrawablesRelative(centerTextDrawable, null, - null, null); - } - mStatusTextView.setText(centerTextLabel); if (centerExplanationLabel != -1) { mExplanationTextView.setText(centerExplanationLabel); - mExplanationTextView.setVisibility(View.VISIBLE); + findViewById(R.id.center_view).setVisibility(View.GONE); + ((TextView)findViewById(R.id.explanation_status)).setText(centerTextLabel); + findViewById(R.id.explanation_view).setVisibility(View.VISIBLE); } else { - mExplanationTextView.setVisibility(View.GONE); + ((TextView)findViewById(R.id.center_text)).setText(centerTextLabel); + findViewById(R.id.center_view).setVisibility(View.VISIBLE); + findViewById(R.id.explanation_view).setVisibility(View.GONE); } mDoneButton.setOnClickListener(InstallAppProgress.this); mOkPanel.setVisibility(View.VISIBLE); @@ -329,8 +326,7 @@ public class InstallAppProgress extends Activity implements View.OnClickListener mLabel = as.label; PackageUtil.initSnippetForNewApp(this, as, R.id.app_snippet); mStatusTextView = (TextView)findViewById(R.id.center_text); - mStatusTextView.setText(R.string.installing); - mExplanationTextView = (TextView) findViewById(R.id.center_explanation); + mExplanationTextView = (TextView) findViewById(R.id.explanation); mProgressBar = (ProgressBar) findViewById(R.id.progress_bar); mProgressBar.setIndeterminate(true); // Hide button till progress is being displayed diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 9681d2cd..e99e7df4 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -165,7 +165,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen getText(R.string.newPerms)), mScrollView); } else { findViewById(R.id.tabscontainer).setVisibility(View.GONE); - findViewById(R.id.divider).setVisibility(View.VISIBLE); + findViewById(R.id.spacer).setVisibility(View.VISIBLE); } if (!supportsRuntimePermissions && N > 0) { permVisible = true; @@ -192,8 +192,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen msg = R.string.install_confirm_question_no_perms; } tabHost.setVisibility(View.GONE); - findViewById(R.id.filler).setVisibility(View.VISIBLE); - findViewById(R.id.divider).setVisibility(View.GONE); mScrollView = null; } if (msg != 0) { |