summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNebojsa Cvetkovic <nebkat@gmail.com>2013-07-20 22:41:49 (GMT)
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-07-20 22:41:49 (GMT)
commit15472de5eabff7e6e98fc327c6e9015ad6b48a74 (patch)
tree68d5e9903d4f6760519ae9587403a450578fdac5
parent12d0e1515a24d08f6ab970e7321fff0b209ad67a (diff)
parent1a6379dcb9ad57735ee2f9b647fcb8c2cdbcab24 (diff)
downloadandroid_packages_apps_Trebuchet-15472de5eabff7e6e98fc327c6e9015ad6b48a74.zip
android_packages_apps_Trebuchet-15472de5eabff7e6e98fc327c6e9015ad6b48a74.tar.gz
android_packages_apps_Trebuchet-15472de5eabff7e6e98fc327c6e9015ad6b48a74.tar.bz2
Merge "Hotseat: Disable hitsPreviousPage if hotseat is vertical" into cm-10.1
-rw-r--r--src/com/cyanogenmod/trebuchet/Hotseat.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Hotseat.java b/src/com/cyanogenmod/trebuchet/Hotseat.java
index d5fd0ec..adf6e9d 100644
--- a/src/com/cyanogenmod/trebuchet/Hotseat.java
+++ b/src/com/cyanogenmod/trebuchet/Hotseat.java
@@ -123,6 +123,16 @@ public class Hotseat extends PagedView {
return (mIsLandscape && mTransposeLayoutWithOrientation);
}
+ @Override
+ protected boolean hitsPreviousPage(float x, float y) {
+ return !hasVerticalHotseat() && super.hitsPreviousPage(x, y);
+ }
+
+ @Override
+ protected boolean hitsNextPage(float x, float y) {
+ return !hasVerticalHotseat() && super.hitsNextPage(x, y);
+ }
+
/* Get the orientation invariant order of the item in the hotseat for persistence. */
int getOrderInHotseat(int x, int y) {
return hasVerticalHotseat() ? (mCellCount - y - 1) : x;