diff options
Diffstat (limited to 'src/com/android/packageinstaller/InstallAppProgress.java')
| -rwxr-xr-x | src/com/android/packageinstaller/InstallAppProgress.java | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java index 6b8994f6..d40d84d9 100755 --- a/src/com/android/packageinstaller/InstallAppProgress.java +++ b/src/com/android/packageinstaller/InstallAppProgress.java @@ -44,7 +44,6 @@ 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; @@ -100,14 +99,15 @@ public class InstallAppProgress extends Activity implements View.OnClickListener return; } // Update the status text - mProgressBar.setVisibility(View.GONE); + mProgressBar.setVisibility(View.INVISIBLE); // 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); - ((ImageView)findViewById(R.id.center_icon)) - .setImageDrawable(getDrawable(R.drawable.ic_done_92)); + centerTextDrawable.setLevel(0); centerTextLabel = R.string.install_done; // Enable or disable launch button mLaunchIntent = getPackageManager().getLaunchIntentForPackage( @@ -130,21 +130,24 @@ public class InstallAppProgress extends Activity implements View.OnClickListener return; } else { // Generic error handling for all other error codes. - ((ImageView)findViewById(R.id.center_icon)) - .setImageDrawable(getDrawable(R.drawable.ic_report_problem_92)); + centerTextDrawable.setLevel(1); centerExplanationLabel = getExplanationFromErrorCode(msg.arg1); centerTextLabel = R.string.install_failed; - mLaunchButton.setVisibility(View.GONE); + mLaunchButton.setVisibility(View.INVISIBLE); } + 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); - findViewById(R.id.center_view).setVisibility(View.GONE); - ((TextView)findViewById(R.id.explanation_status)).setText(centerTextLabel); - findViewById(R.id.explanation_view).setVisibility(View.VISIBLE); + mExplanationTextView.setVisibility(View.VISIBLE); } else { - ((TextView)findViewById(R.id.center_text)).setText(centerTextLabel); - findViewById(R.id.center_view).setVisibility(View.VISIBLE); - findViewById(R.id.explanation_view).setVisibility(View.GONE); + mExplanationTextView.setVisibility(View.GONE); } mDoneButton.setOnClickListener(InstallAppProgress.this); mOkPanel.setVisibility(View.VISIBLE); @@ -326,7 +329,8 @@ 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); - mExplanationTextView = (TextView) findViewById(R.id.explanation); + mStatusTextView.setText(R.string.installing); + mExplanationTextView = (TextView) findViewById(R.id.center_explanation); mProgressBar = (ProgressBar) findViewById(R.id.progress_bar); mProgressBar.setIndeterminate(true); // Hide button till progress is being displayed |