From 1516ebf26afdd10cab81da945251015af2aa819d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 20:18:03 +0100
Subject: Toolbar for settings

---
 .../main/res/drawable-hdpi/ic_arrow_back_white_24dp.png   | Bin 0 -> 287 bytes
 .../main/res/drawable-mdpi/ic_arrow_back_white_24dp.png   | Bin 0 -> 240 bytes
 .../main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png  | Bin 0 -> 336 bytes
 .../main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png | Bin 0 -> 410 bytes
 .../res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png     | Bin 0 -> 530 bytes
 .../src/main/res/layout/preference_toolbar_activity.xml   |  10 ++++++++++
 OpenKeychain/src/main/res/values/strings.xml              |   2 +-
 OpenKeychain/src/main/res/xml/preference_headers.xml      |   4 ++--
 8 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..5fa494878
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..9e662f6d4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..addbfc886
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..4057cc545
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..02f2f6fe8
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
new file mode 100644
index 000000000..a328d15c6
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
@@ -0,0 +1,10 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 7f38d40a1..5bc3c0601 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="title_unlock">"Unlock Key"</string>
     <string name="title_add_subkey">"Add subkey"</string>
     <string name="title_edit_key">"Edit Key"</string>
-    <string name="title_preferences">"Preferences"</string>
+    <string name="title_preferences">"Settings"</string>
     <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string>
     <string name="title_api_registered_apps">"Apps"</string>
     <string name="title_key_server_preference">"Keyserver Preference"</string>
diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index dd7f1c3e6..347394b06 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -1,8 +1,8 @@
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$CloudSearchPrefsFragment"
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$CloudSearchPrefsFragment"
         android:title="@string/section_cloud_search" />
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$AdvancedPrefsFragment"
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment"
         android:title="@string/section_advanced" />
 </preference-headers>
-- 
cgit v1.2.3