aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-14 11:47:42 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-14 11:47:42 +0200
commite2f886d121826df2a97d9f71bc7feab9f6dd52c2 (patch)
treed9ede20b319a262479e319d00afc881519da360a /res
parent876a076e129ae7f2eb7cf7f7e8b2b46c2cb549be (diff)
fetch bookmarks from server
Diffstat (limited to '')
-rw-r--r--res/layout/join_conference_dialog.xml3
-rw-r--r--res/menu/conference_context.xml11
-rw-r--r--res/values/strings.xml1
3 files changed, 14 insertions, 1 deletions
diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml
index 2a0e300a..431bf59e 100644
--- a/res/layout/join_conference_dialog.xml
+++ b/res/layout/join_conference_dialog.xml
@@ -41,6 +41,7 @@
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/save_as_bookmark" />
+ android:text="@string/save_as_bookmark"
+ android:checked="true" />
</LinearLayout>
diff --git a/res/menu/conference_context.xml b/res/menu/conference_context.xml
new file mode 100644
index 00000000..fd898580
--- /dev/null
+++ b/res/menu/conference_context.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/context_join_conference"
+ android:title="@string/join_conference"/>
+ <item
+ android:id="@+id/context_delete_conference"
+ android:title="@string/delete_bookmark"/>
+
+</menu> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 417d838e..9308bba1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -267,4 +267,5 @@
<string name="conference_address">Conference address</string>
<string name="conference_address_example">room@conference.example.com</string>
<string name="save_as_bookmark">Save as bookmark</string>
+ <string name="delete_bookmark">Delete bookmark</string>
</resources> \ No newline at end of file