summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-05-25 10:54:29 -0700
committerRomain Guy <romainguy@google.com>2011-05-25 11:13:20 -0700
commit4725a90e8ea82799fb88fd27db5bb16969ac5abf (patch)
tree2579faaebc6a572e8e35cbfeaba17fa004fc1a63 /core/java
parent7d70fbf0b5672bada8b25f065bc292796c3d4812 (diff)
downloadframeworks_base-4725a90e8ea82799fb88fd27db5bb16969ac5abf.zip
frameworks_base-4725a90e8ea82799fb88fd27db5bb16969ac5abf.tar.gz
frameworks_base-4725a90e8ea82799fb88fd27db5bb16969ac5abf.tar.bz2
Code cleanup.
Change-Id: Ie7685b14e3eb81a2e1034004c3ba04b523e9dd13
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/StackView.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/java/android/widget/StackView.java b/core/java/android/widget/StackView.java
index 71c91e1..c4ba7c8 100644
--- a/core/java/android/widget/StackView.java
+++ b/core/java/android/widget/StackView.java
@@ -116,7 +116,7 @@ public class StackView extends AdapterViewAnimator {
private static final int MIN_TIME_BETWEEN_INTERACTION_AND_AUTOADVANCE = 5000;
- private static long MIN_TIME_BETWEEN_SCROLLS = 100;
+ private static final long MIN_TIME_BETWEEN_SCROLLS = 100;
/**
* These variables are all related to the current state of touch interaction
@@ -213,8 +213,7 @@ public class StackView extends AdapterViewAnimator {
* Animate the views between different relative indexes within the {@link AdapterViewAnimator}
*/
void transformViewForTransition(int fromIndex, int toIndex, final View view, boolean animate) {
- ObjectAnimator alphaOa = null;
- ObjectAnimator oldAlphaOa = null;
+ ObjectAnimator alphaOa;
if (!animate) {
((StackFrame) view).cancelSliderAnimator();
@@ -1276,13 +1275,11 @@ public class StackView extends AdapterViewAnimator {
boolean firstPass = true;
parentRect.set(0, 0, 0, 0);
- int depth = 0;
while (p.getParent() != null && p.getParent() instanceof View
&& !parentRect.contains(globalInvalidateRect)) {
if (!firstPass) {
globalInvalidateRect.offset(p.getLeft() - p.getScrollX(), p.getTop()
- p.getScrollY());
- depth++;
}
firstPass = false;
p = (View) p.getParent();