From 1b581304c6e65f41521ee8f2290c5a94ba620c67 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <serso1988@gmail.com>
Date: Thu, 20 Oct 2011 14:57:59 +0400
Subject: [PATCH] android_1.6_compatibility

---
 AndroidManifest.xml                           | 45 ++++++++++---------
 default.properties                            |  2 +-
 res/layout-land/main.xml                      | 36 +++++++--------
 res/layout-port/main.xml                      | 24 +++++-----
 res/layout/about.xml                          | 22 +++++++--
 res/layout/calc_editor.xml                    |  2 +-
 res/layout/calc_equals_button.xml             |  4 +-
 res/layout/donate.xml                         |  8 ++--
 res/layout/drag_button_calibration.xml        | 10 ++---
 res/layout/history.xml                        | 12 ++---
 res/layout/history_activity.xml               |  8 ++--
 res/layout/number_picker.xml                  |  6 +--
 res/layout/var.xml                            | 16 +++----
 res/layout/var_edit.xml                       | 20 ++++-----
 res/layout/vars.xml                           |  8 ++--
 res/values/styles.xml                         | 16 +++----
 .../calculator/CalculatorActivity.java        |  9 +++-
 .../android/view/widgets/NumberPicker.java    |  4 +-
 18 files changed, 136 insertions(+), 116 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ea6f50dc..12e47715 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:a="http://schemas.android.com/apk/res/android"
 		  package="org.solovyev.android.calculator"
-		  android:versionCode="2"
-		  android:versionName="1.0.2">
+		  a:versionCode="2"
+		  a:versionName="1.0.2">
 
-	<uses-sdk android:minSdkVersion="8"/>
+	<uses-sdk 	a:minSdkVersion="4"
+				a:targetSdkVersion="8"/>
 
-	<application android:icon="@drawable/icon"
-				 android:label="@string/c_app_name">
+	<application a:icon="@drawable/icon"
+				 a:label="@string/c_app_name">
 
-		<activity android:name=".CalculatorActivity"
-				  android:label="@string/c_app_name">
+		<activity a:name=".CalculatorActivity"
+				  a:label="@string/c_app_name">
 
 			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
-				<category android:name="android.intent.category.LAUNCHER"/>
+				<action a:name="android.intent.action.MAIN"/>
+				<category a:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 
 		</activity>
 
-		<activity android:name=".CalculatorPreferencesActivity"
-				  android:label="@string/c_app_settings"
-				  android:configChanges="orientation|keyboardHidden"/>
+		<activity a:name=".CalculatorPreferencesActivity"
+				  a:label="@string/c_app_settings"
+				  a:configChanges="orientation|keyboardHidden"/>
 
-		<activity android:name=".CalculatorHistoryActivity"
-				  android:label="@string/c_app_history"
-				  android:configChanges="orientation|keyboardHidden">
+		<activity a:name=".CalculatorHistoryActivity"
+				  a:label="@string/c_app_history"
+				  a:configChanges="orientation|keyboardHidden">
 		</activity>
 
-		<activity android:name=".AboutActivity"
-				  android:label="@string/c_about"
-				  android:configChanges="orientation|keyboardHidden"/>
+		<activity a:name=".AboutActivity"
+				  a:label="@string/c_about"
+				  a:configChanges="orientation|keyboardHidden"/>
 
-		<activity android:name=".CalculatorVarsActivity"
-				  android:label="@string/c_vars_and_constants"
-				  android:configChanges="orientation|keyboardHidden">
+		<activity a:name=".CalculatorVarsActivity"
+				  a:label="@string/c_vars_and_constants"
+				  a:configChanges="orientation|keyboardHidden">
 		</activity>
 
 	</application>
diff --git a/default.properties b/default.properties
index e2e8061f..b74c4880 100644
--- a/default.properties
+++ b/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-4
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index 06014743..a8a91a43 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -3,19 +3,19 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			  a:orientation="vertical"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent"
 			  a:background="#ff000000">
 
 	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="match_parent"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent"
 			a:orientation="vertical"
 			a:layout_gravity="center">
 
 		<include layout="@layout/calc_editor"/>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 																   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
@@ -25,8 +25,8 @@
 																   calc:directionTextScale="0.5"
 																   style="?controlButtonStyle"
 																   a:onClick="moveLeftButtonClickHandler"
-																   a:layout_width="match_parent"
-																   a:layout_height="match_parent"
+																   a:layout_width="fill_parent"
+																   a:layout_height="fill_parent"
 																   a:layout_weight="1.5"/>
 
 
@@ -36,14 +36,14 @@
 														   a:drawableTop="@drawable/sym_keyboard_delete"
 														   style="?controlImageButtonStyle"
 														   a:onClick="eraseButtonClickHandler"
-														   a:layout_width="match_parent"
-														   a:layout_height="match_parent"
+														   a:layout_width="fill_parent"
+														   a:layout_height="fill_parent"
 														   a:layout_weight="1.5"/>
 
 
 			<include layout="@layout/calc_display"
-					 a:layout_width="match_parent"
-					 a:layout_height="match_parent"
+					 a:layout_width="fill_parent"
+					 a:layout_height="fill_parent"
 					 a:layout_weight="1"/>
 
 			<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
@@ -53,8 +53,8 @@
 														   a:textStyle="bold"
 														   style="?controlImageButtonStyle"
 														   a:onClick="clearButtonClickHandler"
-														   a:layout_width="match_parent"
-														   a:layout_height="match_parent"
+														   a:layout_width="fill_parent"
+														   a:layout_height="fill_parent"
 														   a:layout_weight="1.5"/>
 
 			<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
@@ -65,13 +65,13 @@
 																   calc:directionTextScale="0.5"
 																   style="?controlButtonStyle"
 																   a:onClick="moveRightButtonClickHandler"
-																   a:layout_width="match_parent"
-																   a:layout_height="match_parent"
+																   a:layout_width="fill_parent"
+																   a:layout_height="fill_parent"
 																   a:layout_weight="1.5"/>
 
 		</LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_history_button"/>
 			<include layout="@layout/calc_paste_button"/>
@@ -83,7 +83,7 @@
 
 		</LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_vars_button"/>
 			<include layout="@layout/calc_copy_button"/>
@@ -95,7 +95,7 @@
 
 		</LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_donate_button"/>
 			<include layout="@layout/calc_square_brackets_button"/>
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index 4ddceba1..26f34451 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -2,27 +2,27 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="vertical"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent"
 			  a:background="#ff000000">
 
 	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="match_parent"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent"
 			a:orientation="vertical"
 			a:layout_gravity="center">
 
 		<include layout="@layout/calc_editor"/>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_display"
-					 a:layout_width="match_parent"
-					 a:layout_height="match_parent"/>
+					 a:layout_width="fill_parent"
+					 a:layout_height="fill_parent"/>
 
 		</LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_one_digit_button"/>
 			<include layout="@layout/calc_two_digit_button"/>
@@ -32,7 +32,7 @@
 
 		</LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_four_digit_button"/>
 			<include layout="@layout/calc_five_digit_button"/>
@@ -42,7 +42,7 @@
 
 		</LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_seven_digit_button"/>
 			<include layout="@layout/calc_eight_digit_button"/>
@@ -52,7 +52,7 @@
 
 		</LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_round_brackets_button"/>
 			<include layout="@layout/calc_zero_digit_button"/>
@@ -63,7 +63,7 @@
 		</LinearLayout>
 
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<include layout="@layout/calc_left_button"/>
 			<include layout="@layout/calc_right_button"/>
diff --git a/res/layout/about.xml b/res/layout/about.xml
index c245c5f9..b8a08823 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -8,8 +8,8 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="vertical"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent"
 			  a:background="#ff000000">
 
 	<ImageView a:layout_width="wrap_content"
@@ -22,12 +22,26 @@
 	<TextView
 			a:id="@+id/aboutTextView"
 			a:text="@string/c_copyright"
-			a:layout_height="match_parent"
-			a:layout_width="match_parent"
+			a:layout_height="fill_parent"
+			a:layout_width="fill_parent"
+			a:layout_gravity="top|center_horizontal"
+			a:layout_weight="1"
+			a:scrollbars="vertical"
+			style="@style/about_style"/>
+
+	<!--
+			a:scrollbarFadeDuration="0" is not support in  android_1.6_compatibility
+
+		<TextView
+			a:id="@+id/aboutTextView"
+			a:text="@string/c_copyright"
+			a:layout_height="fill_parent"
+			a:layout_width="fill_parent"
 			a:layout_gravity="top|center_horizontal"
 			a:layout_weight="1"
 			a:scrollbars="vertical"
 			a:scrollbarFadeDuration="0"
 			style="@style/about_style"/>
+			-->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/calc_editor.xml b/res/layout/calc_editor.xml
index ff0122f2..71790b5d 100644
--- a/res/layout/calc_editor.xml
+++ b/res/layout/calc_editor.xml
@@ -8,7 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:layout_weight="2"
-			  a:layout_width="match_parent"
+			  a:layout_width="fill_parent"
 			  a:layout_height="0dp">
 
 	<org.solovyev.android.calculator.CalculatorEditor
diff --git a/res/layout/calc_equals_button.xml b/res/layout/calc_equals_button.xml
index 5bb61c7a..c864f01d 100644
--- a/res/layout/calc_equals_button.xml
+++ b/res/layout/calc_equals_button.xml
@@ -9,7 +9,7 @@
 		xmlns:a="http://schemas.android.com/apk/res/android"
 		a:id="@+id/equalsButton"
 		a:text="="
-		a:layout_width="match_parent"
-		a:layout_height="match_parent"
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
 		style="?controlButtonStyle"
 		a:onClick="numericButtonClickHandler"/>
\ No newline at end of file
diff --git a/res/layout/donate.xml b/res/layout/donate.xml
index 64aa7d3c..b6cfeef7 100644
--- a/res/layout/donate.xml
+++ b/res/layout/donate.xml
@@ -7,13 +7,13 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent">
 
 	<TextView a:id="@+id/donateText"
 			  style="@style/about_style"
-			  a:layout_width="match_parent"
+			  a:layout_width="fill_parent"
 			  a:text="@string/c_donate_text"
-			  a:layout_height="match_parent"/>
+			  a:layout_height="fill_parent"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/drag_button_calibration.xml b/res/layout/drag_button_calibration.xml
index ca040aab..3795fc97 100644
--- a/res/layout/drag_button_calibration.xml
+++ b/res/layout/drag_button_calibration.xml
@@ -3,18 +3,18 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			  a:orientation="vertical"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent"
 			  a:background="#ff000000">
 
 	<LinearLayout
 			a:id="@+id/simplePad"
-			a:layout_width="match_parent"
-			a:layout_height="match_parent"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent"
 			a:orientation="vertical"
 			a:layout_gravity="center">
 
-		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
+		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
 			<ImageView a:id="@+id/calibrationArrowLeft"
 					   a:layout_gravity="left"
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 4330976e..323df2a0 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -8,20 +8,20 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="vertical"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent">
 
 	<TextView a:id="@+id/history_time"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent"
 			  a:textColor="@android:color/white"
 			  a:paddingLeft="6dp"
 			  a:paddingRight="6dp"
 			  a:textStyle="bold"/>
 
 	<TextView a:id="@+id/history_item"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent"
 			  a:paddingBottom="6dp"
 			  a:paddingLeft="6dp"
 			  a:paddingRight="6dp"/>
diff --git a/res/layout/history_activity.xml b/res/layout/history_activity.xml
index 48b190c0..c0165d13 100644
--- a/res/layout/history_activity.xml
+++ b/res/layout/history_activity.xml
@@ -8,12 +8,12 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
     a:orientation="vertical"
-    a:layout_width="match_parent"
-    a:layout_height="match_parent">
+    a:layout_width="fill_parent"
+    a:layout_height="fill_parent">
 
     <ListView
-        a:layout_width="match_parent"
-        a:layout_height="match_parent"
+        a:layout_width="fill_parent"
+        a:layout_height="fill_parent"
         a:layout_weight="1"
         a:id="@android:id/list"/>
 
diff --git a/res/layout/number_picker.xml b/res/layout/number_picker.xml
index cad57c54..093538af 100644
--- a/res/layout/number_picker.xml
+++ b/res/layout/number_picker.xml
@@ -9,12 +9,12 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/increment"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_up_btn" />
 
     <EditText android:id="@+id/timepicker_input"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:singleLine="true"
@@ -24,7 +24,7 @@
         android:background="@drawable/timepicker_input" />
 
     <org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/decrement"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_down_btn" />
 
diff --git a/res/layout/var.xml b/res/layout/var.xml
index 8dbc7a6a..2fdc739d 100644
--- a/res/layout/var.xml
+++ b/res/layout/var.xml
@@ -8,17 +8,17 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="vertical"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent">
 
 	<LinearLayout
 			a:orientation="horizontal"
-			a:layout_width="match_parent"
-			a:layout_height="match_parent">
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent">
 
 		<TextView a:id="@+id/var_text"
-				  a:layout_width="match_parent"
-				  a:layout_height="match_parent"
+				  a:layout_width="fill_parent"
+				  a:layout_height="fill_parent"
 				  a:textSize="20dp"
 				  a:textColor="@android:color/white"
 				  a:paddingBottom="3dp"
@@ -31,8 +31,8 @@
 	</LinearLayout>
 
 	<TextView a:id="@+id/var_description"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent"
 			  a:paddingBottom="6dp"
 			  a:paddingLeft="6dp"
 			  a:paddingRight="6dp"
diff --git a/res/layout/var_edit.xml b/res/layout/var_edit.xml
index 6d5edfad..4e458571 100644
--- a/res/layout/var_edit.xml
+++ b/res/layout/var_edit.xml
@@ -7,47 +7,47 @@
   -->
 
 <ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
-			a:layout_width="match_parent"
-			a:layout_height="match_parent">
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent">
 
 	<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 				  a:id="@+id/var_edit"
 				  a:orientation="vertical"
-				  a:layout_width="match_parent"
-				  a:layout_height="match_parent"
+				  a:layout_width="fill_parent"
+				  a:layout_height="fill_parent"
 				  a:scrollbars="vertical"
 				  a:scrollbarAlwaysDrawVerticalTrack="true">
 
-		<TextView a:layout_height="match_parent"
+		<TextView a:layout_height="fill_parent"
 				  a:layout_width="wrap_content"
 				  a:padding="6dp"
 				  a:text="@string/c_var_name"/>
 
 		<EditText a:id="@+id/var_edit_name"
-				  a:layout_width="match_parent"
+				  a:layout_width="fill_parent"
 				  a:layout_height="wrap_content"
 				  a:textSize="20dp">
 		</EditText>
 
-		<TextView a:layout_height="match_parent"
+		<TextView a:layout_height="fill_parent"
 				  a:layout_width="wrap_content"
 				  a:padding="6dp"
 				  a:text="@string/c_var_value"/>
 
 		<EditText a:id="@+id/var_edit_value"
-				  a:layout_width="match_parent"
+				  a:layout_width="fill_parent"
 				  a:layout_height="wrap_content"
 				  a:inputType="numberDecimal"
 				  a:textSize="20dp">
 		</EditText>
 
-		<TextView a:layout_height="match_parent"
+		<TextView a:layout_height="fill_parent"
 				  a:layout_width="wrap_content"
 				  a:padding="6dp"
 				  a:text="@string/c_var_description"/>
 
 		<EditText a:id="@+id/var_edit_description"
-				  a:layout_width="match_parent"
+				  a:layout_width="fill_parent"
 				  a:layout_height="wrap_content"
 				  a:textSize="20dp">
 		</EditText>
diff --git a/res/layout/vars.xml b/res/layout/vars.xml
index 1e66cacb..f999168a 100644
--- a/res/layout/vars.xml
+++ b/res/layout/vars.xml
@@ -8,12 +8,12 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
     a:orientation="vertical"
-    a:layout_width="match_parent"
-    a:layout_height="match_parent">
+    a:layout_width="fill_parent"
+    a:layout_height="fill_parent">
 
     <ListView
-        a:layout_width="match_parent"
-        a:layout_height="match_parent"
+        a:layout_width="fill_parent"
+        a:layout_height="fill_parent"
         a:layout_weight="1"
         a:id="@android:id/list"/>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9eb4eb98..4421f250 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -8,8 +8,8 @@
 	</style>
 
 	<style name="button_style">
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">match_parent</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">fill_parent</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:focusable">true</item>
 		<item name="android:textSize">20dp</item>
@@ -58,8 +58,8 @@
 		<item name="android:textColor">@color/text_color</item>
 		<item name="android:gravity">left|top</item>
 		<item name="android:padding">5dp</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">match_parent</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">fill_parent</item>
 	</style>
 
 	<style name="display_style">
@@ -68,8 +68,8 @@
 		<item name="android:textColor">@color/text_color</item>
 		<item name="android:gravity">right|center_vertical</item>
 		<item name="android:padding">5dp</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">match_parent</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">fill_parent</item>
 	</style>
 
 	<style name="about_style">
@@ -78,8 +78,8 @@
 		<item name="android:textColor">@color/text_color</item>
 		<item name="android:gravity">center</item>
 		<item name="android:padding">5dp</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">match_parent</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">fill_parent</item>
 	</style>
 
 	<style name="default_theme">
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index c60c30b9..c01aefd6 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -341,13 +341,18 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 
 	public void restart() {
 		final Intent intent = getIntent();
+		/*
+		for compatibility with android_1.6_compatibility
 		overridePendingTransition(0, 0);
-		intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+		intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);*/
 
 		Log.d(this.getClass().getName(), "Finishing current activity!");
 		finish();
 
-		overridePendingTransition(0, 0);
+		/*
+		for compatibility with android_1.6_compatibility
+
+		overridePendingTransition(0, 0);*/
 		Log.d(this.getClass().getName(), "Starting new activity!");
 		startActivity(intent);
 	}
diff --git a/src/main/java/org/solovyev/android/view/widgets/NumberPicker.java b/src/main/java/org/solovyev/android/view/widgets/NumberPicker.java
index 83646db2..61d427ae 100644
--- a/src/main/java/org/solovyev/android/view/widgets/NumberPicker.java
+++ b/src/main/java/org/solovyev/android/view/widgets/NumberPicker.java
@@ -283,8 +283,8 @@ public class NumberPicker extends LinearLayout {
 
         if (displayedValues != null) {
             // Allow text entry rather than strictly numeric entry.
-            mText.setRawInputType(InputType.TYPE_CLASS_TEXT |
-                    InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+            mText.setRawInputType(InputType.TYPE_CLASS_TEXT/* |
+                    InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS*/);
         }
     }