projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add beep when test completes
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosViewPager.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
index ebddc2661023a1d960a90eec0b3606104bbd4652..e8299b09aeda4f2de7f6f0d334b7cbda14c545b4 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
@@
-34,10
+34,17
@@
public class AltosViewPager extends ViewPager {
@Override
protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
@Override
protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
- if(v.getClass().getPackage().getName().startsWith("maps.")){
+ if (v.getClass().getName().endsWith("MapView"))
+ return true;
+
+ if(v.getClass() != null &&
+ v.getClass().getPackage() != null &&
+ v.getClass().getPackage().getName() != null &&
+ v.getClass().getPackage().getName().startsWith("maps."))
+ {
return true;
}
return super.canScroll(v, checkV, dx, x, y);
}
return true;
}
return super.canScroll(v, checkV, dx, x, y);
}
-}
\ No newline at end of file
+}