drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb

Browse Source 
* commit 'cdd5626da62cb2dc013cded470e264232617f635':
  Cleaning up some StackView bad behavior
This commit is contained in:
Adam Cohen
2011-01-20 21:42:45 -08:00
committed by Android Git Automerger
parent 8e2d489a86 cdd5626da6
commit f95a963e73
4 changed files with 53 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/11.xml
View File

@ -260249,7 +260249,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="arg0" type="T">
<parameter name="t" type="T">
</parameter>
</method>
</interface>

2
api/current.xml
View File

@ -261712,7 +261712,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="arg0" type="T">
<parameter name="t" type="T">
</parameter>
</method>
</interface>

96
core/java/android/widget/AdapterViewAnimator.java
View File

@ -323,20 +323,6 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
setDisplayedChild(mWhichChild - 1);
}
/**
* Shows only the specified child. The other displays Views exit the screen,
* optionally with the with the {@link #getOutAnimation() out animation} and
* the specified child enters the screen, optionally with the
* {@link #getInAnimation() in animation}.
*
* @param childIndex The index of the child to be shown.
* @param animate Whether or not to use the in and out animations, defaults
* to true.
*/
void showOnly(int childIndex, boolean animate) {
showOnly(childIndex, animate, false);
}
int modulo(int pos, int size) {
if (size > 0) {
return (size + (pos % size)) % size;
@ -363,7 +349,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
int getNumActiveViews() {
if (mAdapter != null) {
return Math.min(mAdapter.getCount() + 1, mMaxNumActiveViews);
return Math.min(getCount() + 1, mMaxNumActiveViews);
} else {
return mMaxNumActiveViews;
}
@ -371,7 +357,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
int getWindowSize() {
if (mAdapter != null) {
int adapterCount = mAdapter.getCount();
int adapterCount = getCount();
if (adapterCount <= getNumActiveViews() && mLoopViews) {
return adapterCount*mMaxNumActiveViews;
} else {
@ -396,16 +382,16 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
for (int i = mCurrentWindowStart; i <= mCurrentWindowEnd; i++) {
int index = modulo(i, getWindowSize());
int adapterCount = mAdapter.getCount();
int adapterCount = getCount();
// get the fresh child from the adapter
View updatedChild = mAdapter.getView(modulo(i, adapterCount), null, this);
final View updatedChild = mAdapter.getView(modulo(i, adapterCount), null, this);
if (mViewsMap.containsKey(index)) {
FrameLayout fl = (FrameLayout) mViewsMap.get(index).view;
// flush out the old child
fl.removeAllViewsInLayout();
final FrameLayout fl = (FrameLayout) mViewsMap.get(index).view;
// add the new child to the frame, if it exists
if (updatedChild != null) {
// flush out the old child
fl.removeAllViewsInLayout();
fl.addView(updatedChild);
}
}
@ -423,9 +409,19 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
return new FrameLayout(mContext);
}
void showOnly(int childIndex, boolean animate, boolean onLayout) {
/**
* Shows only the specified child. The other displays Views exit the screen,
* optionally with the with the {@link #getOutAnimation() out animation} and
* the specified child enters the screen, optionally with the
* {@link #getInAnimation() in animation}.
*
* @param childIndex The index of the child to be shown.
* @param animate Whether or not to use the in and out animations, defaults
* to true.
*/
void showOnly(int childIndex, boolean animate) {
if (mAdapter == null) return;
final int adapterCount = mAdapter.getCount();
final int adapterCount = getCount();
if (adapterCount == 0) return;
for (int i = 0; i < mPreviousViews.size(); i++) {
@ -463,7 +459,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
// This section clears out any items that are in our active views list
// but are outside the effective bounds of our window (this is becomes an issue
// at the extremities of the list, eg. where newWindowStartUnbounded < 0 or
// newWindowEndUnbounded > mAdapter.getCount() - 1
// newWindowEndUnbounded > adapterCount - 1
for (Integer index : mViewsMap.keySet()) {
boolean remove = false;
if (!wrap && (index < rangeStart || index > rangeEnd)) {
@ -531,22 +527,8 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
mCurrentWindowEnd = newWindowEnd;
mCurrentWindowStartUnbounded = newWindowStartUnbounded;
}
mFirstTime = false;
if (!onLayout) {
requestLayout();
invalidate();
} else {
// If the Adapter tries to layout the current view when we get it using getView
// above the layout will end up being ignored since we are currently laying out, so
// we post a delayed requestLayout and invalidate
mMainQueue.post(new Runnable() {
public void run() {
requestLayout();
invalidate();
}
});
}
requestLayout();
invalidate();
}
private void addChild(View child) {
@ -702,21 +684,30 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
measureChildren();
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
void checkForAndHandleDataChanged() {
boolean dataChanged = mDataChanged;
if (dataChanged) {
handleDataChanged();
post(new Runnable() {
public void run() {
handleDataChanged();
// if the data changes, mWhichChild might be out of the bounds of the adapter
// in this case, we reset mWhichChild to the beginning
if (mWhichChild >= getWindowSize()) {
mWhichChild = 0;
// if the data changes, mWhichChild might be out of the bounds of the adapter
// in this case, we reset mWhichChild to the beginning
if (mWhichChild >= mAdapter.getCount()) {
mWhichChild = 0;
showOnly(mWhichChild, true, true);
}
refreshChildren();
showOnly(mWhichChild, true);
}
refreshChildren();
requestLayout();
}
});
}
mDataChanged = false;
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
checkForAndHandleDataChanged();
final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) {
@ -727,7 +718,6 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
child.layout(mPaddingLeft, mPaddingTop, childRight, childBottom);
}
mDataChanged = false;
}
static class SavedState extends BaseSavedState {
@ -921,8 +911,10 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
if (mAdapter != null) {
mDataSetObserver = new AdapterDataSetObserver();
mAdapter.registerDataSetObserver(mDataSetObserver);
mItemCount = mAdapter.getCount();
}
setFocusable(true);
setDisplayedChild(0);
}
/**

40
core/java/android/widget/StackView.java
View File

@ -384,8 +384,8 @@ public class StackView extends AdapterViewAnimator {
}
@Override
void showOnly(int childIndex, boolean animate, boolean onLayout) {
super.showOnly(childIndex, animate, onLayout);
void showOnly(int childIndex, boolean animate) {
super.showOnly(childIndex, animate);
// Here we need to make sure that the z-order of the children is correct
for (int i = mCurrentWindowEnd; i >= mCurrentWindowStart; i--) {
@ -529,7 +529,7 @@ public class StackView extends AdapterViewAnimator {
requestDisallowInterceptTouchEvent(true);
if (mAdapter == null) return;
final int adapterCount = mAdapter.getCount();
final int adapterCount = getCount();
int activeIndex;
if (mStackMode == ITEMS_SLIDE_UP) {
@ -951,19 +951,6 @@ public class StackView extends AdapterViewAnimator {
}
}
/**
* {@inheritDoc}
*/
@Override
public void onRemoteAdapterConnected() {
super.onRemoteAdapterConnected();
// On first run, we want to set the stack to the end.
if (mWhichChild == -1) {
mWhichChild = 0;
}
setDisplayedChild(mWhichChild);
}
LayoutParams createOrReuseLayoutParams(View v) {
final ViewGroup.LayoutParams currentLp = v.getLayoutParams();
if (currentLp instanceof LayoutParams) {
@ -979,18 +966,7 @@ public class StackView extends AdapterViewAnimator {
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
boolean dataChanged = mDataChanged;
if (dataChanged) {
handleDataChanged();
// if the data changes, mWhichChild might be out of the bounds of the adapter
// in this case, we reset mWhichChild to the beginning
if (mWhichChild >= mAdapter.getCount())
mWhichChild = 0;
showOnly(mWhichChild, true, true);
refreshChildren();
}
checkForAndHandleDataChanged();
final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) {
@ -1004,8 +980,6 @@ public class StackView extends AdapterViewAnimator {
childRight + lp.horizontalOffset, childBottom + lp.verticalOffset);
}
mDataChanged = false;
onLayout();
}
@ -1014,7 +988,7 @@ public class StackView extends AdapterViewAnimator {
long timeSinceLastInteraction = System.currentTimeMillis() - mLastInteractionTime;
if (mAdapter == null) return;
final int adapterCount = mAdapter.getCount();
final int adapterCount = getCount();
if (adapterCount == 1 && mLoopViews) return;
if (mSwipeGestureType == GESTURE_NONE &&
@ -1089,6 +1063,7 @@ public class StackView extends AdapterViewAnimator {
heightSpecSize = height;
} else {
heightSpecSize |= MEASURED_STATE_TOO_SMALL;
}
} else {
heightSpecSize = 0;
@ -1112,7 +1087,6 @@ public class StackView extends AdapterViewAnimator {
widthSpecSize = 0;
}
}
setMeasuredDimension(widthSpecSize, heightSpecSize);
measureChildren();
}
@ -1294,4 +1268,4 @@ public class StackView extends AdapterViewAnimator {
mask.recycle();
}
}
}
}