--- a/AndroidManifest.xml Tue Jan 22 15:01:56 2013 +0100
+++ b/AndroidManifest.xml Tue Jan 22 17:26:11 2013 +0100
@@ -4,7 +4,7 @@
android:versionName="0.1.7" android:installLocation="auto">
<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="16" />
- <uses-feature name="android.hardware.touchscreen" required="false" />
+ <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<permission android:permissionGroup="android.permission-group.NETWORK"
android:label="BeemService" android:description="@string/BeemServiceDescription"
@@ -22,7 +22,8 @@
<application android:label="@string/app_name"
android:icon="@drawable/beem_launcher_icon_silver"
- android:name=".BeemApplication">
+ android:name=".BeemApplication"
+ android:allowBackup="true" >
<activity android:name=".ui.Login" android:label="@string/app_name"
android:launchMode="standard">
@@ -32,7 +33,6 @@
</intent-filter>
</activity>
<activity android:name=".ui.wizard.Account" android:label="Account wizard" />
- <activity android:name=".ui.wizard.AccountConfigure" android:label="Account wizard" />
<activity android:name=".ui.LoginAnim" android:label="@string/login_login_progress"
android:launchMode="singleTop" android:screenOrientation="portrait" />
<activity android:name=".ui.Settings" android:label="@string/edit_settings_name" />
@@ -43,7 +43,6 @@
android:windowSoftInputMode="stateHidden" />
<activity android:name=".ui.AddContact" android:label="@string/AddCActTitle" />
<activity android:name=".ui.Subscription" android:label="@string/app_name" />
- <activity android:name=".ui.wizard.CreateAccountActivity" android:label="@string/create_account_name" />
<activity android:name=".ui.ContactList" android:label="@string/contact_list_name"
android:launchMode="singleTask" />
@@ -62,6 +61,7 @@
-->
<provider android:name=".providers.AvatarProvider"
android:authorities="com.beem.project.beem.providers.avatarprovider"
+ android:exported="true"
/>
<service android:name="BeemService" android:enabled="true"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/res/layout-v11/create_account.xml Tue Jan 22 17:26:11 2013 +0100
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <ScrollView android:layout_width="fill_parent" android:layout_height="0dip"
+ android:layout_weight="1" >
+ <LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent"
+ android:orientation="vertical" >
+ <ImageView android:id="@+id/logo"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:layout_marginBottom="30dp"
+ android:src="@drawable/logo"/>
+
+ <TextView
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:text="@string/create_account_text"
+ android:textSize="18sp"
+ android:paddingBottom="10dip"
+ android:focusable="true" />
+ <TextView
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:text="@string/create_account_username" style="@style/Label" />
+ <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <EditText android:id="@+id/create_account_username"
+ android:inputType="textEmailAddress" android:imeOptions="actionNext"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:minWidth="120dp"
+ android:hint="beem"
+ android:contentDescription="@string/create_account_username"/>
+ <TextView
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:text=" @ " style="@style/Label" />
+ <AutoCompleteTextView android:id="@+id/xmpp_server"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:minWidth="160dp"
+ android:gravity="left"
+ android:hint="beem-project.com"
+ android:completionThreshold="1"
+ android:inputType="textNoSuggestions"
+ style="?android:attr/dropDownSpinnerStyle"/>
+ </LinearLayout>
+ <TextView
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:text="@string/create_account_password" style="@style/Label" />
+ <EditText android:id="@+id/create_account_password"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:inputType="textPassword" android:imeOptions="actionNext"
+ android:singleLine="true"
+ android:contentDescription="@string/create_account_password"/>
+ <TextView
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:text="@string/create_account_confirm_password" style="@style/Label" />
+ <EditText android:id="@+id/create_account_confirm_password"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:inputType="textPassword" android:imeOptions="actionNext"
+ android:singleLine="true"
+ android:contentDescription="@string/create_account_confirm_password"/>
+ <TextView android:id="@+id/settings_warn_label" style="@style/Label"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:text="@string/account_wizard_settings_warn"
+ android:inputType="textMultiLine|textNoSuggestions"
+ android:textColor="@color/white"
+ android:textStyle="normal"
+ android:visibility="gone" />
+ <TextView android:id="@+id/error_label"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:textColor="@color/red" android:textStyle="bold"
+ android:inputType="textMultiLine"
+ style="@style/Label"/>
+ </LinearLayout>
+ </ScrollView>
+
+ <RelativeLayout
+ android:gravity="right|center_vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:background="@drawable/bottombar" >
+ <Button
+ android:id="@+id/next"
+ android:text="@string/Continue"
+ android:minWidth="100dp"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:drawableRight="@drawable/button_indicator_next"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:enabled="false"
+ />
+ </RelativeLayout>
+
+</LinearLayout>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/res/layout-v11/simple_combobox_item.xml Tue Jan 22 17:26:11 2013 +0100
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ style="?android:attr/dropDownItemStyle"
+ android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
+ android:singleLine="true"
+ android:layout_width="match_parent"
+ android:layout_height="36dip"
+ android:ellipsize="marquee" />
--- a/res/layout/changestatus.xml Tue Jan 22 15:01:56 2013 +0100
+++ b/res/layout/changestatus.xml Tue Jan 22 17:26:11 2013 +0100
@@ -3,7 +3,7 @@
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout android:orientation="vertical"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
android:padding="10dip">
<LinearLayout android:id="@+id/avatar_panel"
android:orientation="vertical"
@@ -29,10 +29,9 @@
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_below="@id/ChangeStatusSpinner"
style="@style/Label"
- android:inputType="textShortMessage|textCapSentences|textAutoCorrect|textMultiLine|textImeMultiLine"
- android:imeOptions="actionDone"
android:selectAllOnFocus="true"
android:focusable="true"
+ android:text="@string/ChangeStatusMessage"
/>
<EditText android:id="@+id/ChangeStatusMessage"
android:inputType="textShortMessage|textAutoCorrect"
--- a/res/layout/create_account.xml Tue Jan 22 15:01:56 2013 +0100
+++ b/res/layout/create_account.xml Tue Jan 22 17:26:11 2013 +0100
@@ -41,7 +41,7 @@
android:hint="beem-project.com"
android:completionThreshold="1"
android:inputType="textNoSuggestions"
- style="?android:attr/dropDownSpinnerStyle"/>
+ />
</LinearLayout>
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
--- a/res/layout/simple_combobox_item.xml Tue Jan 22 15:01:56 2013 +0100
+++ b/res/layout/simple_combobox_item.xml Tue Jan 22 17:26:11 2013 +0100
@@ -2,7 +2,6 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="?android:attr/dropDownItemStyle"
- android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="36dip"
--- a/res/layout/subscription.xml Tue Jan 22 15:01:56 2013 +0100
+++ b/res/layout/subscription.xml Tue Jan 22 17:26:11 2013 +0100
@@ -3,7 +3,7 @@
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical">
<LinearLayout android:orientation="vertical"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
android:padding="10dip">
<TextView android:layout_width="wrap_content"
--- a/res/layout/wizard_account_configure.xml Tue Jan 22 15:01:56 2013 +0100
+++ b/res/layout/wizard_account_configure.xml Tue Jan 22 17:26:11 2013 +0100
@@ -72,7 +72,6 @@
</ScrollView>
<RelativeLayout
- android:layout_alignParentBottom="true"
android:gravity="right"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
--- a/res/values-fr/strings.xml Tue Jan 22 15:01:56 2013 +0100
+++ b/res/values-fr/strings.xml Tue Jan 22 17:26:11 2013 +0100
@@ -37,6 +37,7 @@
<!-- ChangeStatus class -->
<string name="ChangeStatusActTitle">Beem - Changer mon statut</string>
<string name="ChangeStatusType">Mon statut</string>
+ <string name="ChangeStatusMessage">Mon message de statut</string>
<string name="OpenContactList">Ouvrir la liste des contacts</string>
<string name="ChangeStatusOk">Mise à jour du statut</string>
--- a/res/values/strings.xml Tue Jan 22 15:01:56 2013 +0100
+++ b/res/values/strings.xml Tue Jan 22 17:26:11 2013 +0100
@@ -37,6 +37,7 @@
<!-- ChangeStatus class -->
<string name="ChangeStatusActTitle">Beem - Change my status</string>
<string name="ChangeStatusType">My status</string>
+ <string name="ChangeStatusMessage">My status message</string>
<string name="OpenContactList">Open contact list</string>
<string name="ChangeStatusOk">Updating status</string>