From 4817f11cb0181f66e3724404b391706d09829b3c Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 21 Nov 2013 06:53:01 +0100
Subject: Fix lints warnings, change folder icons

---
 res/drawable-hdpi/ic_doc_generic_am.png   | Bin 0 -> 694 bytes
 res/drawable-hdpi/ic_root_folder_am.png   | Bin 0 -> 508 bytes
 res/drawable-mdpi/ic_doc_generic_am.png   | Bin 0 -> 561 bytes
 res/drawable-mdpi/ic_root_folder_am.png   | Bin 0 -> 442 bytes
 res/drawable-xhdpi/ic_doc_generic_am.png  | Bin 0 -> 831 bytes
 res/drawable-xhdpi/ic_root_folder_am.png  | Bin 0 -> 582 bytes
 res/drawable-xxhdpi/ic_doc_generic_am.png | Bin 0 -> 585 bytes
 res/drawable-xxhdpi/ic_root_folder_am.png | Bin 0 -> 1263 bytes
 res/drawable/file.png                     | Bin 571 -> 0 bytes
 res/drawable/folder.png                   | Bin 392 -> 0 bytes
 res/layout/log_silders.xml                |   8 ++++----
 res/layout/vpnstatus.xml                  |   6 +++---
 res/values/strings.xml                    |   7 +++++++
 13 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_doc_generic_am.png
 create mode 100644 res/drawable-hdpi/ic_root_folder_am.png
 create mode 100644 res/drawable-mdpi/ic_doc_generic_am.png
 create mode 100644 res/drawable-mdpi/ic_root_folder_am.png
 create mode 100644 res/drawable-xhdpi/ic_doc_generic_am.png
 create mode 100644 res/drawable-xhdpi/ic_root_folder_am.png
 create mode 100644 res/drawable-xxhdpi/ic_doc_generic_am.png
 create mode 100644 res/drawable-xxhdpi/ic_root_folder_am.png
 delete mode 100644 res/drawable/file.png
 delete mode 100644 res/drawable/folder.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_doc_generic_am.png b/res/drawable-hdpi/ic_doc_generic_am.png
new file mode 100644
index 00000000..55b9b7d3
Binary files /dev/null and b/res/drawable-hdpi/ic_doc_generic_am.png differ
diff --git a/res/drawable-hdpi/ic_root_folder_am.png b/res/drawable-hdpi/ic_root_folder_am.png
new file mode 100644
index 00000000..915e1182
Binary files /dev/null and b/res/drawable-hdpi/ic_root_folder_am.png differ
diff --git a/res/drawable-mdpi/ic_doc_generic_am.png b/res/drawable-mdpi/ic_doc_generic_am.png
new file mode 100644
index 00000000..a1bd14ea
Binary files /dev/null and b/res/drawable-mdpi/ic_doc_generic_am.png differ
diff --git a/res/drawable-mdpi/ic_root_folder_am.png b/res/drawable-mdpi/ic_root_folder_am.png
new file mode 100644
index 00000000..4352d08d
Binary files /dev/null and b/res/drawable-mdpi/ic_root_folder_am.png differ
diff --git a/res/drawable-xhdpi/ic_doc_generic_am.png b/res/drawable-xhdpi/ic_doc_generic_am.png
new file mode 100644
index 00000000..e05c4b48
Binary files /dev/null and b/res/drawable-xhdpi/ic_doc_generic_am.png differ
diff --git a/res/drawable-xhdpi/ic_root_folder_am.png b/res/drawable-xhdpi/ic_root_folder_am.png
new file mode 100644
index 00000000..c916e0be
Binary files /dev/null and b/res/drawable-xhdpi/ic_root_folder_am.png differ
diff --git a/res/drawable-xxhdpi/ic_doc_generic_am.png b/res/drawable-xxhdpi/ic_doc_generic_am.png
new file mode 100644
index 00000000..c0988663
Binary files /dev/null and b/res/drawable-xxhdpi/ic_doc_generic_am.png differ
diff --git a/res/drawable-xxhdpi/ic_root_folder_am.png b/res/drawable-xxhdpi/ic_root_folder_am.png
new file mode 100644
index 00000000..077c851c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_root_folder_am.png differ
diff --git a/res/drawable/file.png b/res/drawable/file.png
deleted file mode 100644
index fa45699e..00000000
Binary files a/res/drawable/file.png and /dev/null differ
diff --git a/res/drawable/folder.png b/res/drawable/folder.png
deleted file mode 100644
index 0108ed93..00000000
Binary files a/res/drawable/folder.png and /dev/null differ
diff --git a/res/layout/log_silders.xml b/res/layout/log_silders.xml
index 5df97490..1035cb4a 100644
--- a/res/layout/log_silders.xml
+++ b/res/layout/log_silders.xml
@@ -27,7 +27,7 @@
     <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Timestamps"/>
+            android:text="@string/timestamps"/>
 
     <RadioGroup
             android:id="@+id/timeFormatRadioGroup"
@@ -38,21 +38,21 @@
         <RadioButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="None"
+                android:text="@string/timestamps_none"
                 android:id="@+id/radioNone"
                 />
 
         <RadioButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Short"
+                android:text="@string/timestamp_short"
                 android:id="@+id/radioShort"
                 />
 
         <RadioButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="ISO"
+                android:text="@string/timestamp_iso"
                 android:id="@+id/radioISO"
                 />
 
diff --git a/res/layout/vpnstatus.xml b/res/layout/vpnstatus.xml
index 0c765fe6..eb7c53ee 100644
--- a/res/layout/vpnstatus.xml
+++ b/res/layout/vpnstatus.xml
@@ -9,7 +9,7 @@
 
 
     <TextView
-            android:text="Upload"
+            android:text="@string/uploaded_data"
             style="@style/logWindowStatusTitle"/>
 
     <TextView
@@ -18,7 +18,7 @@
             tools:text="4 Mbit/s 6.7 GB"/>
 
     <TextView
-            android:text="Download"
+            android:text="@string/downloaded_data"
             style="@style/logWindowStatusTitle"/>
 
     <TextView
@@ -34,7 +34,7 @@
 
 
     <TextView
-            android:text="Vpn Status"
+            android:text="@string/vpn_status"
             style="@style/logWindowStatusTitle"/>
 
     <TextView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0a4c9509..91b246b0 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -299,4 +299,11 @@
     <string name="logCleared">Log cleared.</string>
     <string name="show_password">Show password</string>
     <string name="keyChainAccessError">KeyChain Access error: %s</string>
+    <string name="timestamp_short">Short</string>
+    <string name="timestamp_iso">ISO</string>
+    <string name="timestamps">Timestamps</string>
+    <string name="timestamps_none">None</string>
+    <string name="uploaded_data">Upload</string>
+    <string name="downloaded_data">Download</string>
+    <string name="vpn_status">Vpn Status</string>
 </resources>
-- 
cgit v1.2.3