going back to API Level 7 = 2.1

amalgta · May 12, 2014 · 27c250b · 27c250b
1 parent 23209fe
commit 27c250b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -4,8 +4,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="8" />
+        android:minSdkVersion="7"
+        android:targetSdkVersion="7" />
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CALL_PHONE" />

diff --git a/project.properties b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-8
+target=android-7
diff --git a/res/layout/apps.xml b/res/layout/apps.xml
@@ -6,7 +6,7 @@
     <TextView
         android:id="@+id/txtMain"
         style="@style/Main"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:gravity="center"
@@ -15,7 +15,7 @@
     <TextView
         android:id="@+id/txtHelp"
         style="@style/Help"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/txtMain"
         android:gravity="center"

diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
@@ -6,7 +6,7 @@
     <TextView
         android:id="@+id/txtMain"
         style="@style/Main"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:gravity="center"
@@ -15,7 +15,7 @@
     <TextView
         android:id="@+id/txtCurrentDigit"
         style="@style/Help"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/txtMain"
         android:gravity="center"

diff --git a/res/layout/main.xml b/res/layout/main.xml
@@ -6,7 +6,7 @@
     <TextView
         android:id="@+id/txtMain"
         style="@style/Main"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:gravity="center"
@@ -15,7 +15,7 @@
     <TextView
         android:id="@+id/txtHelp"
         style="@style/Help"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/txtMain"
         android:gravity="center"

diff --git a/res/layout/missedcalls.xml b/res/layout/missedcalls.xml
@@ -6,7 +6,7 @@
     <TextView
         android:id="@+id/txtMain"
         style="@style/Main"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:gravity="center"
@@ -15,7 +15,7 @@
     <TextView
         android:id="@+id/txtHelp"
         style="@style/Help"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/txtMain"
         android:gravity="center"

diff --git a/res/layout/phonebook.xml b/res/layout/phonebook.xml
@@ -6,7 +6,7 @@
     <TextView
         android:id="@+id/txtMain"
         style="@style/Main"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:gravity="center"
@@ -15,7 +15,7 @@
     <TextView
         android:id="@+id/txtHelp"
         style="@style/Help"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/txtMain"
         android:gravity="center"

diff --git a/src/net/zaczek/launcherforblind/activitysupport/AbstractActivity.java b/src/net/zaczek/launcherforblind/activitysupport/AbstractActivity.java
@@ -157,7 +157,7 @@ protected void onLongPress() {
 	public boolean onTouchEvent(MotionEvent event) {
 		this.mDetector.onTouchEvent(event);
 
-		int action = event.getActionMasked();
+		int action = event.getAction();
 		switch (action) {
 		case MotionEvent.ACTION_DOWN:
 			scrollSaveX = event.getX();