Merge "Fix app icon in notification guts." into nyc-dev

am: 1c7cd0a882

* commit '1c7cd0a8826350d08e3576627c8cd61d5c6b20bd':
  Fix app icon in notification guts.
This commit is contained in:
Julia Reynolds
2016-03-01 20:02:48 +00:00
committed by android-build-merger
2 changed files with 2 additions and 2 deletions

View File

@@ -39,7 +39,7 @@
android:layout_gravity="center_vertical|start">
<ImageView
android:id="@android:id/icon"
android:id="@+id/app_icon"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginEnd="6dp"

View File

@@ -987,7 +987,7 @@ public abstract class BaseStatusBar extends SystemUI implements
pkgicon = pmUser.getDefaultActivityIcon();
}
((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(pkgicon);
((ImageView) row.findViewById(R.id.app_icon)).setImageDrawable(pkgicon);
((TextView) row.findViewById(R.id.pkgname)).setText(appname);
final View settingsButton = guts.findViewById(R.id.more_settings);