Merge "Make side-load install path material design-y" into nyc-dev

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 f743b042..369566f1 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -164,7 +164,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;
@@ -191,8 +191,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) {