diff options
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/edu/umich/PowerTutor/ui/PowerViewer.java | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f4b86f4..74956b0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.1" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="edu.umich.PowerTutor" - android:versionCode="13" android:versionName="1.4"> + android:versionCode="15" android:versionName="1.5"> <application android:icon="@drawable/icon" android:label="@string/app_name"> <activity android:name=".ui.UMLogger" android:label="@string/app_name" diff --git a/src/edu/umich/PowerTutor/ui/PowerViewer.java b/src/edu/umich/PowerTutor/ui/PowerViewer.java index 7eadec8..d0c0d96 100644 --- a/src/edu/umich/PowerTutor/ui/PowerViewer.java +++ b/src/edu/umich/PowerTutor/ui/PowerViewer.java @@ -42,6 +42,7 @@ import android.view.Gravity; import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -141,8 +142,14 @@ public class PowerViewer extends Activity { height of 0 so this is important. */
chartLayout.setMinimumHeight(100 * components);
- ScrollView scrollView = new ScrollView(this);
+ ScrollView scrollView = new ScrollView(this) {
+ public boolean onInterceptTouchEvent(android.view.MotionEvent ev) {
+ return true;
+ }
+ };
+
scrollView.addView(chartLayout);
+ scrollView.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
setContentView(scrollView);
}
|