diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-02-26 21:53:56 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-24 10:09:02 +0000 |
| commit | c6f8c8c92e73efb0aa675a89ca4eded9ebd77615 (patch) | |
| tree | 0c43ecb0d6d61a200404de1d541b03b81e607d0d /src/com/cyanogenmod/trebuchet/PagedView.java | |
| parent | 8ef4f37b141f5e48bb5a63fc401d6ea9fbd9a8b1 (diff) | |
| download | android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.tar.gz android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.tar.bz2 android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.zip | |
Hotseat: Multiple Pages
Conflicts:
res/layout-land/hotseat.xml
res/layout-port/hotseat.xml
res/values/strings.xml
res/xml/default_workspace.xml
res/xml/preferences.xml
src/com/beansoft/launcher/preference/PreferencesProvider.java
src/com/cyanogenmod/trebuchet/Hotseat.java
src/com/cyanogenmod/trebuchet/PagedView.java
src/com/cyanogenmod/trebuchet/Workspace.java
Change-Id: I958b105451160841d5d7d345164dcb2dec4f9404
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/PagedView.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/PagedView.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/trebuchet/PagedView.java b/src/com/cyanogenmod/trebuchet/PagedView.java index b1fee549c..a2b353f7f 100644 --- a/src/com/cyanogenmod/trebuchet/PagedView.java +++ b/src/com/cyanogenmod/trebuchet/PagedView.java @@ -195,6 +195,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private boolean mHasScrollIndicator = true; private boolean mShouldShowScrollIndicator = false; private boolean mShouldShowScrollIndicatorImmediately = false; + protected boolean mHandleScrollIndicator = false; protected static final int sScrollIndicatorFadeInDuration = 150; protected static final int sScrollIndicatorFadeOutDuration = 650; protected static final int sScrollIndicatorFadeOutShortDuration = 150; @@ -2017,6 +2018,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mShouldShowScrollIndicatorImmediately = true; if (getChildCount() <= 1) return; if (!isScrollingIndicatorEnabled()) return; + if (mHandleScrollIndicator) return; mShouldShowScrollIndicator = false; getScrollingIndicator(); @@ -2048,6 +2050,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc protected void hideScrollingIndicator(boolean immediately, int duration) { if (getChildCount() <= 1) return; if (!isScrollingIndicatorEnabled()) return; + if (mHandleScrollIndicator) return; getScrollingIndicator(); if (mScrollIndicator != null) { @@ -2105,6 +2108,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private void updateScrollingIndicator() { if (getChildCount() <= 1) return; if (!isScrollingIndicatorEnabled()) return; + if (mHandleScrollIndicator) return; getScrollingIndicator(); if (mScrollIndicator != null) { @@ -2118,6 +2122,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private void updateScrollingIndicatorPosition() { if (!isScrollingIndicatorEnabled()) return; if (mScrollIndicator == null) return; + if (mHandleScrollIndicator) return; int numPages = getChildCount(); int pageSize = !mVertical ? getMeasuredWidth() : getMeasuredHeight(); int lastChildIndex = Math.max(0, getChildCount() - 1); |