# HG changeset patch
# User nikita@nikita-rack
# Date 1240324705 -7200
# Node ID 666ffa5135b950ddda2c7f26cd5a98048c7f3e02
# Parent ec30f9790f830ddf39a2ff9d2aae2b1d0bea4a76
popop
diff -r ec30f9790f83 -r 666ffa5135b9 AndroidManifest.xml
--- a/AndroidManifest.xml Wed Apr 15 20:09:24 2009 +0200
+++ b/AndroidManifest.xml Tue Apr 21 16:38:25 2009 +0200
@@ -7,10 +7,12 @@
+
+
diff -r ec30f9790f83 -r 666ffa5135b9 default.properties
--- a/default.properties Wed Apr 15 20:09:24 2009 +0200
+++ b/default.properties Tue Apr 21 16:38:25 2009 +0200
@@ -7,8 +7,6 @@
# "build.properties", and override values to adapt the script to your
# project structure.
-# Project target.
-target=android-3
# apk configurations. This property allows creation of APK files with limited
# resources. For example, if your application contains many locales and
# you wish to release multiple smaller apks instead of a large one, you can
@@ -20,3 +18,5 @@
# apk-config-european=en,fr,it,de,es
# apk-config-northamerica=en,es
apk-configurations=
+# Project target.
+target=android-3
diff -r ec30f9790f83 -r 666ffa5135b9 project.aidl
--- a/project.aidl Wed Apr 15 20:09:24 2009 +0200
+++ b/project.aidl Tue Apr 21 16:38:25 2009 +0200
@@ -4,5 +4,5 @@
parcelable com.beem.project.beem.BeemException
parcelable com.beem.project.beem.service.Message
+parcelable com.beem.project.beem.service.PresenceAdapter
parcelable com.beem.project.beem.service.Contact
-parcelable com.beem.project.beem.service.PresenceAdapter
diff -r ec30f9790f83 -r 666ffa5135b9 res/menu/contactlistmenu.xml
--- a/res/menu/contactlistmenu.xml Wed Apr 15 20:09:24 2009 +0200
+++ b/res/menu/contactlistmenu.xml Tue Apr 21 16:38:25 2009 +0200
@@ -1,4 +1,5 @@
diff -r ec30f9790f83 -r 666ffa5135b9 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java Wed Apr 15 20:09:24 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java Tue Apr 21 16:38:25 2009 +0200
@@ -37,7 +37,8 @@
public class ContactList extends ExpandableListActivity {
private static final String TAG = "CONTACTLIST_ACT";
- private static final int PREFERENCECHANGED = 0;
+ private static final int PREFERENCECHANGED = 0;
+ private static final int CREATEACCOUNT = 1;
private IXmppFacade mService = null;
private SharedPreferences mSettings;
private Handler mHandler;
@@ -146,6 +147,9 @@
return true;
case R.id.account_about:
return true;
+ case R.id.account_create:
+ startActivity(new Intent(this, AccountCreation.class));
+ return true;
default:
return false;
}
diff -r ec30f9790f83 -r 666ffa5135b9 src/com/beem/project/beem/ui/ContactListSettings.java
--- a/src/com/beem/project/beem/ui/ContactListSettings.java Wed Apr 15 20:09:24 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactListSettings.java Tue Apr 21 16:38:25 2009 +0200
@@ -4,7 +4,6 @@
import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.View;
-import android.util.Log;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;