aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-04 21:44:16 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-04 21:44:16 +0100
commit4fd8620c6cc1ca88c4496671e6e59c40aba93019 (patch)
tree1e5063ec85002960036e39071ae210903167b7d5 /res
parent0d80d88736926d06e97f22f9ecc63d4fb696751c (diff)
allow to temporarily disable accounts
Diffstat (limited to '')
-rw-r--r--res/drawable-hdpi/ic_action_add_person.pngbin0 -> 679 bytes
-rw-r--r--res/drawable-hdpi/ic_action_delete.pngbin0 -> 1624 bytes
-rw-r--r--res/drawable-mdpi/ic_action_add_person.pngbin0 -> 513 bytes
-rw-r--r--res/drawable-mdpi/ic_action_delete.pngbin0 -> 1359 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_add_person.pngbin0 -> 884 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_delete.pngbin0 -> 1848 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_add_person.pngbin0 -> 1171 bytes
-rw-r--r--res/layout/account_row.xml3
-rw-r--r--res/menu/manageaccounts.xml3
-rw-r--r--res/menu/manageaccounts_context.xml17
-rw-r--r--res/values/arrays.xml4
11 files changed, 25 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_action_add_person.png b/res/drawable-hdpi/ic_action_add_person.png
new file mode 100644
index 00000000..5ebac970
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png
new file mode 100644
index 00000000..e9ce89e0
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_delete.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_add_person.png b/res/drawable-mdpi/ic_action_add_person.png
new file mode 100644
index 00000000..c43cf655
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png
new file mode 100644
index 00000000..cedb1085
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_delete.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_add_person.png b/res/drawable-xhdpi/ic_action_add_person.png
new file mode 100644
index 00000000..91434a47
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png
new file mode 100644
index 00000000..98c73da1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_delete.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/res/drawable-xxhdpi/ic_action_add_person.png
new file mode 100644
index 00000000..f18aa614
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 92e179f8..402cb965 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -2,7 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="8dp">
+ android:padding="8dp"
+ android:background="?android:attr/activatedBackgroundIndicator">
diff --git a/res/menu/manageaccounts.xml b/res/menu/manageaccounts.xml
index 63441919..1d81ba3c 100644
--- a/res/menu/manageaccounts.xml
+++ b/res/menu/manageaccounts.xml
@@ -2,7 +2,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:id="@+id/action_add_account"
android:showAsAction="always"
- android:title="@string/action_add_account"/>
+ android:title="@string/action_add_account"
+ android:icon="@drawable/ic_action_add_person"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
new file mode 100644
index 00000000..30ba747d
--- /dev/null
+++ b/res/menu/manageaccounts_context.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item android:icon="@drawable/ic_action_delete"
+ android:title="Delete"
+ android:showAsAction="always"
+ />
+ <item
+ android:id="@+id/account_disable"
+ android:title="Temporarily disable"
+ android:showAsAction="always"/>
+ <item
+ android:id="@+id/account_enable"
+ android:title="Enable"
+ android:showAsAction="always"
+ android:visible="false"/>
+
+</menu>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 592007ba..b8135cde 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -10,4 +10,8 @@
<item>pgp</item>
<item>otr</item>
</array>
+ <array name="manage_account_options">
+ <item>Delete</item>
+ <item>Disable</item>
+ </array>
</resources>