diff options
author | Michael Jurka <mikejurka@google.com> | 2012-02-23 18:25:43 -0800 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2012-02-24 12:53:08 -0800 |
commit | 6cfafb96c3b108fec90897c1a251229be9861ddb (patch) | |
tree | 59676434d1209f38823f707f3f1505f04772769d /src | |
parent | 7747119b4085faf856f45e915872c2675aa6a672 (diff) | |
download | android_packages_apps_Trebuchet-6cfafb96c3b108fec90897c1a251229be9861ddb.tar.gz android_packages_apps_Trebuchet-6cfafb96c3b108fec90897c1a251229be9861ddb.tar.bz2 android_packages_apps_Trebuchet-6cfafb96c3b108fec90897c1a251229be9861ddb.zip |
Fix a lot of easy lint issues
Change-Id: I80b43dae137cbbb912ec0fcc4e401de16a9b44a1
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizeTabHost.java | 14 | ||||
-rw-r--r-- | src/com/android/launcher2/DragView.java | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java index 152b21588..7108c9f53 100644 --- a/src/com/android/launcher2/AppsCustomizeTabHost.java +++ b/src/com/android/launcher2/AppsCustomizeTabHost.java @@ -55,10 +55,17 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona private boolean mInTransition; private boolean mTransitioningToWorkspace; private boolean mResetAfterTransition; + private Runnable mRelayoutAndMakeVisible; public AppsCustomizeTabHost(Context context, AttributeSet attrs) { super(context, attrs); mLayoutInflater = LayoutInflater.from(context); + mRelayoutAndMakeVisible = new Runnable() { + public void run() { + mTabs.requestLayout(); + mTabsContainer.setAlpha(1f); + } + }; } /** @@ -144,12 +151,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona if (contentWidth > 0 && mTabs.getLayoutParams().width != contentWidth) { // Set the width and show the tab bar mTabs.getLayoutParams().width = contentWidth; - post(new Runnable() { - public void run() { - mTabs.requestLayout(); - mTabsContainer.setAlpha(1f); - } - }); + post(mRelayoutAndMakeVisible); } } super.onMeasure(widthMeasureSpec, heightMeasureSpec); diff --git a/src/com/android/launcher2/DragView.java b/src/com/android/launcher2/DragView.java index 017d154f7..c3c274eca 100644 --- a/src/com/android/launcher2/DragView.java +++ b/src/com/android/launcher2/DragView.java @@ -110,6 +110,7 @@ public class DragView extends View { // Force a measure, because Workspace uses getMeasuredHeight() before the layout pass int ms = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); measure(ms, ms); + mPaint = new Paint(Paint.FILTER_BITMAP_FLAG); } public float getOffsetY() { @@ -162,9 +163,6 @@ public class DragView extends View { p.setColor(0xaaffffff); canvas.drawRect(0, 0, getWidth(), getHeight(), p); } - if (mPaint == null) { - mPaint = new Paint(Paint.FILTER_BITMAP_FLAG); - } mHasDrawn = true; boolean crossFade = mCrossFadeProgress > 0 && mCrossFadeBitmap != null; @@ -203,6 +201,9 @@ public class DragView extends View { public void setPaint(Paint paint) { mPaint = paint; + if (mPaint == null) { + mPaint = new Paint(Paint.FILTER_BITMAP_FLAG); + } invalidate(); } @@ -213,9 +214,6 @@ public class DragView extends View { @Override public void setAlpha(float alpha) { super.setAlpha(alpha); - if (mPaint == null) { - mPaint = new Paint(Paint.FILTER_BITMAP_FLAG); - } mPaint.setAlpha((int) (255 * alpha)); invalidate(); } |