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

am 84928fa9: am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair

Browse Source 
Merge commit '84928fa93c3be222b77794de9922d299f4971ea4'

* commit '84928fa93c3be222b77794de9922d299f4971ea4':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
This commit is contained in:
Jim Miller
2010-01-21 17:56:03 -08:00
committed by Android Git Automerger
parent c22b3ca198 84928fa93c
commit cd2354f540
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/com/android/internal/widget/SlidingTab.java
View File

@@ -145,20 +145,6 @@ public class SlidingTab extends ViewGroup {
void onGrabbedStateChange(View v, int grabbedState);
}
// TODO: For debugging; remove after glitches debugged.
@Override
protected void dispatchDraw(Canvas canvas) {
int orientation = getResources().getConfiguration().orientation;
if (mOrientation == HORIZONTAL && orientation != Configuration.ORIENTATION_PORTRAIT
|| mOrientation == VERTICAL && orientation != Configuration.ORIENTATION_LANDSCAPE) {
// UBER HACK ALERT. This is a workaround for a configuration race condition between
// orientation changed notification and the resize notification. This just prevents
// us from drawing under this circumstance, though the view will still be wrong.
return;
}
super.dispatchDraw(canvas);
}
/**
* Simple container class for all things pertinent to a slider.
* A slider consists of 3 Views:
@@ -433,7 +419,7 @@ public class SlidingTab extends ViewGroup {
/**
* Start animating the slider. Note we need two animations since an Animator
* keeps internal state of the invalidation region which is just the view being animated.
*
*
* @param anim1
* @param anim2
*/
@@ -671,7 +657,7 @@ public class SlidingTab extends ViewGroup {
resetView();
}
anim.setAnimationListener(mAnimationDoneListener);
/* Animation can be the same for these since the animation just holds */
mLeftSlider.startAnimation(anim, anim);
mRightSlider.startAnimation(anim, anim);