aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-11 14:07:52 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-11 14:07:52 +0200
commit0193e0291cff98843ce04aae3de05aa020e8d71d (patch)
treef1aa5d49010abed3d9ee3e74c929509463a9664a /res
parentf6649ef8382551c8b4010e194d6d77241bc86215 (diff)
cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites
Diffstat (limited to '')
-rw-r--r--res/layout/activity_new_conversation.xml56
-rw-r--r--res/menu/newconversation.xml15
-rw-r--r--res/menu/newconversation_context.xml21
3 files changed, 0 insertions, 92 deletions
diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml
deleted file mode 100644
index 78500ead..00000000
--- a/res/layout/activity_new_conversation.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#e5e5e5" >
-
-
- <ProgressBar
- android:id="@+id/progressBar1"
- style="?android:attr/progressBarStyleLarge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:visibility="gone"
- />
-
- <EditText
- android:id="@+id/new_conversation_search"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:background="#eee"
- android:ems="10"
- android:hint="@string/search_jabber_id"
- android:inputType="textEmailAddress"
- android:paddingBottom="12dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="12dp" />
-
- <TextView
- android:id="@+id/contacts_header"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Contacts"
- style="@style/sectionHeader"
- android:layout_below="@+id/new_conversation_search"
- android:paddingLeft="8dp"
- android:paddingTop="8dp"
- android:paddingRight="8dp"/>
-
- <ListView
- android:id="@+id/contactList"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/contacts_header"
- tools:listitem="@layout/contact"
- android:choiceMode="multipleChoice">
-
- </ListView>
-</RelativeLayout> \ No newline at end of file
diff --git a/res/menu/newconversation.xml b/res/menu/newconversation.xml
deleted file mode 100644
index 4f9b6da0..00000000
--- a/res/menu/newconversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
- <item
- android:id="@+id/action_accounts"
- android:orderInCategory="90"
- android:showAsAction="never"
- android:title="@string/action_accounts"
- />
-
- <item
- android:id="@+id/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never"
- android:title="@string/action_settings"/>
-</menu>
diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml
deleted file mode 100644
index 8b454d42..00000000
--- a/res/menu/newconversation_context.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item
- android:id="@+id/action_contact_details"
- android:showAsAction="ifRoom"
- android:title="@string/action_contact_details" />
- <item
- android:id="@+id/action_start_conversation"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_chat"
- android:title="@string/start_conversation" />
- <item
- android:id="@+id/action_invite"
- android:showAsAction="ifRoom"
- android:title="@string/invite_contacts" />
- <item
- android:id="@+id/action_invite_to_existing"
- android:showAsAction="never"
- android:title="@string/invite_contacts_to_existing" />
-</menu>