Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Debug code for window transition crash" into jb-mr1-dev

Browse Source
This commit is contained in:
Michael Jurka
2012-09-05 03:09:09 -07:00
committed by Android (Google) Code Review
parent 580e9f72e0 a4dd30174d
commit a1730fa4f1
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
View File

@@ -164,13 +164,6 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
convertView = createView(parent);
if (convertView.getParent() != null) {
throw new RuntimeException("Recycled child has parent");
}
} else {
if (convertView.getParent() != null) {
throw new RuntimeException("Recycled child has parent");
}
}
ViewHolder holder = (ViewHolder) convertView.getTag();
@@ -600,6 +593,9 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
usingDrawingCache = true;
}
if (bm == null) {
throw new RuntimeException("Recents thumbnail is null");
}
ActivityOptions opts = ActivityOptions.makeThumbnailScaleUpAnimation(
holder.thumbnailViewImage, bm, 0, 0, null);

10
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -488,11 +488,18 @@ public abstract class BaseStatusBar extends SystemUI implements
.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_width);
float thumbHeight = res
.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_height);
if (first == null) {
throw new RuntimeException("Recents thumbnail is null");
}
if (first.getWidth() != thumbWidth || first.getHeight() != thumbHeight) {
first = Bitmap.createScaledBitmap(first, (int) thumbWidth, (int) thumbHeight,
true);
if (first == null) {
throw new RuntimeException("Recents thumbnail is null");
}
}
DisplayMetrics dm = new DisplayMetrics();
mDisplay.getMetrics(dm);
// calculate it here, but consider moving it elsewhere
@@ -521,8 +528,7 @@ public abstract class BaseStatusBar extends SystemUI implements
+ thumbBgPadding + thumbLeftMargin);
y = (int) (dm.heightPixels
- res.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_height) - thumbBgPadding);
} else { // if (config.orientation ==
// Configuration.ORIENTATION_LANDSCAPE) {
} else { // if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
float thumbTopMargin = res
.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_top_margin);
float thumbBgPadding = res