Getting changes from master

PayBack/AndroidManifest.xml

@@ -7,7 +7,7 @@
     <uses-sdk
         android:minSdkVersion="9"
         android:targetSdkVersion="18" />
-
+    
     <protected-broadcast />
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -30,83 +30,109 @@
         <activity
             android:name="com.example.payback.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme"
+            android:screenOrientation="portrait" >
         </activity>
         <activity
             android:name="com.example.payback.CreateTransactionActivity"
             android:label="@string/title_activity_create_transaction"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.ContactActivity"
             android:label="@string/title_activity_contact"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.ManageGroupActivity"
             android:label="@string/title_activity_manage_group"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.ResolveTransactionActivity"
             android:label="@string/title_activity_resolve_transaction"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.NotificationActivity"
             android:label="@string/title_activity_notification"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.StatisticActivity"
             android:label="@string/title_activity_statistic"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme"
+            android:screenOrientation="portrait" >
         </activity>
         <activity
             android:name="com.example.payback.Transaction2Activity"
             android:label="@string/title_activity_transaction2"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.Transaction1Activity"
             android:label="@string/title_activity_transaction1"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan">
         </activity>
         <activity
             android:name="com.example.payback.Transaction3Activity"
             android:label="@string/title_activity_transaction3"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.Transaction4Activity"
             android:label="@string/title_activity_transaction4"
             android:theme="@style/AppTheme"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" >
         </activity>
         <activity
             android:name="com.example.payback.Transaction5Activity"
             android:label="@string/title_activity_transaction5"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.CreateAccountActivity"
             android:label="@string/title_activity_create_account"
-            android:theme="@style/DefaultAppTheme" >
+            android:theme="@style/DefaultAppTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.TitleActivity"
-            android:label="@string/title_activity_title" >
+            android:label="@string/title_activity_title" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="com.example.payback.ShortcutsActivity"
             android:label="@string/title_activity_shortcuts"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" >
-        </activity>
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:screenOrientation="portrait" >
+        </activity>
+
+        <receiver android:name="PageKillReceiver">
+			<intent-filter>
+			    <action android:name="com.Payback.CUSTOM_INTENT">
+	      		</action>
+	      	</intent-filter>
+	   	</receiver>
+
+        <activity android:name="org.achartengine.GraphicalActivity" />
 
     </application>
 

PayBack/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-13
+target=android-10
 android.library.reference.1=../../Test/gridlayout_v7

PayBack/res/layout/activity_contact.xml

@@ -3,23 +3,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/activitybackground"
-    android:gravity="right"
+    android:gravity="center|bottom"
     android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:scrollbars="vertical"
     tools:context=".ContactActivity" >
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:gravity="center"
-        android:orientation="horizontal" >
-
-    </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -33,34 +25,36 @@
             android:layout_height="wrap_content"
             android:layout_gravity="right"
             android:onClick="showCreateContact"
-            android:text="@string/transaction2_newContact" />
+            android:text="@string/transaction2_newContact"
+            android:textSize="32dp" />
 
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="14dp"
+        android:layout_marginTop="14dp"
         android:layout_weight="1"
         android:baselineAligned="false"
         android:gravity="center"
         android:orientation="horizontal" >
-    
+
 	    <ListView
+
 	        android:id="@+id/listofselected"
 	        android:layout_width="fill_parent"
 	        android:layout_height="match_parent"
+	        android:layout_weight="1"
 	        android:cacheColorHint="#00000000"
 	        android:dividerHeight="0.05dp"
 	        android:focusableInTouchMode="true"
-	        android:longClickable="true"
-	        android:smoothScrollbar="true" >
-
-	    </ListView>
+	        android:smoothScrollbar="true" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
         android:layout_weight="0"
@@ -70,11 +64,13 @@
         <Button
             android:id="@+id/button2"
             style="?android:attr/buttonStyleSmall"
-            android:layout_width="100dp"
-            android:layout_height="50dp"
+            android:layout_width="fill_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="left"
             android:onClick="showMainMenu"
-            android:text="@string/Home" />
+            android:text="@string/Home"
+            android:textSize="32dp" />
+
     </LinearLayout>
 
 </LinearLayout>

PayBack/res/layout/activity_login.xml

@@ -1,9 +1,6 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".LoginActivity" >
-
-    <!-- Login form -->
-
         <LinearLayout
             style="@style/LoginFormContainer"
             android:layout_height="400dp"
@@ -32,17 +29,46 @@
                 android:maxLines="1"
                 android:singleLine="true" />
 
-            <Button
-                android:id="@+id/sign_in_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginTop="16dp"
-                android:onClick="Login"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
-                android:text="@string/action_sign_in_short" />
-
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+
+                <CheckBox
+                    android:id="@+id/rememberLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="0.73"
+                    android:text="@string/remember" />
+
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="53dp"
+                    android:layout_gravity="center_vertical" >
+
+                    <ProgressBar
+                        android:id="@+id/ProgBar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:layout_centerVertical="true"
+                        android:visibility="gone" />
+
+                    <Button
+                        android:id="@+id/sign_in_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:layout_alignParentLeft="true"
+                        android:onClick="Login"
+                        android:paddingLeft="32dp"
+                        android:paddingRight="32dp"
+                        android:text="@string/action_sign_in_short" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
             <TextView
                 android:id="@+id/link_to_register"
                 android:layout_width="fill_parent"
@@ -56,13 +82,6 @@
                 android:textColor="#0b84aa"
                 android:textSize="16sp" />
 
-            <Button
-                android:id="@+id/devB"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="bypass"
-                android:text="Developer Mode" />
-
         </LinearLayout>
 
 </merge>