am e1f9c798: am 6e7f5426: am ccb4dda8: Fix for 2268060, 2251223 if conditional...

am e1f9c798: am 6e7f5426: am ccb4dda8: Fix for 2268060, 2251223 if conditional initializing package label. Also load the label from the new pkg for existing packages Use installer\'s metrics and configuration info when creating resources for new package

Merge commit 'e1f9c798'

* commit 'e1f9c798':
  Fix for 2268060, 2251223 if conditional initializing package label.

src/com/android/packageinstaller/InstallAppProgress.java

@@ -144,13 +144,9 @@ public class InstallAppProgress extends Activity implements View.OnClickListener
         }
         if((installFlags & PackageManager.INSTALL_REPLACE_EXISTING )!= 0) {
             Log.w(TAG, "Replacing package:" + mAppInfo.packageName);
-            // Initialize views
-            PackageUtil.initSnippetForInstalledApp(this, mAppInfo,
-                    R.id.app_snippet);
-        } else {
-            PackageUtil.initSnippetForNewApp(this, mAppInfo,
-                    R.id.app_snippet, mPackageURI);
         }
+        PackageUtil.initSnippetForNewApp(this, mAppInfo,
+                R.id.app_snippet, mPackageURI);
         mStatusTextView = (TextView)findViewById(R.id.center_text);
         mStatusTextView.setText(R.string.installing);
         mProgressBar = (ProgressBar) findViewById(R.id.progress_bar);

src/com/android/packageinstaller/PackageUtil.java

@@ -115,11 +115,10 @@ public class PackageUtil {
             int snippetId, Uri packageURI) {
         View appSnippet = pContext.findViewById(snippetId);
         final String archiveFilePath = packageURI.getPath();
-        DisplayMetrics metrics = new DisplayMetrics();
-        metrics.setToDefaults();
+        Resources pRes = pContext.getResources();
         AssetManager assmgr = new AssetManager();
         assmgr.addAssetPath(archiveFilePath);
-        Resources res = new Resources(assmgr, metrics, null);
+        Resources res = new Resources(assmgr, pRes.getDisplayMetrics(), pRes.getConfiguration());
         CharSequence label = null;
         // Try to load the label from the package's resources. If an app has not explicitly
         // specified any label, just use the package name.
@@ -129,10 +128,9 @@ public class PackageUtil {
             } catch (Resources.NotFoundException e) {
             }
         }
-        if ((label == null) && (appInfo.nonLocalizedLabel != null)) {
-            label = appInfo.nonLocalizedLabel;
-        } else {
-            label = appInfo.packageName;
+        if (label == null) {
+            label = (appInfo.nonLocalizedLabel != null) ?
+                    appInfo.nonLocalizedLabel : appInfo.packageName;
         }
         Drawable icon = null;
         // Try to load the icon from the package's resources. If an app has not explicitly