From 87010e6094cc35ece98d3beadbbfbc59ea0a25b3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 28 Sep 2014 16:33:25 +0200
Subject: more improvments for new notification service

---
 res/layout/message_received.xml | 10 ++++------
 res/layout/message_sent.xml     | 20 +++++++++-----------
 res/values-eu/arrays.xml        |  7 ++++---
 res/values-eu/strings.xml       |  4 ++--
 res/xml/preferences.xml         |  8 +-------
 5 files changed, 20 insertions(+), 29 deletions(-)

(limited to 'res')

diff --git a/res/layout/message_received.xml b/res/layout/message_received.xml
index 28c04a70..730d00d5 100644
--- a/res/layout/message_received.xml
+++ b/res/layout/message_received.xml
@@ -54,7 +54,7 @@
                 android:text="@string/download_image"
                 android:visibility="gone" />
 
-           <LinearLayout
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
@@ -65,12 +65,10 @@
                     android:layout_width="?attr/TextSizeInfo"
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:src="@drawable/ic_secure_indicator"
                     android:layout_marginRight="4sp"
-                    android:alpha="0.54"/>
-                
-              
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_secure_indicator" />
 
                 <TextView
                     android:id="@+id/message_time"
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index 9167012a..28f3ddc6 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -63,27 +63,25 @@
                     android:textColor="@color/secondarytext"
                     android:textSize="?attr/TextSizeInfo" />
 
-                 <ImageView
+                <ImageView
                     android:id="@+id/security_indicator"
                     android:layout_width="?attr/TextSizeInfo"
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:src="@drawable/ic_secure_indicator"
                     android:layout_marginLeft="4sp"
-                    android:alpha="0.54"/>
-                
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_secure_indicator" />
+
                 <ImageView
                     android:id="@+id/indicator_received"
                     android:layout_width="?attr/TextSizeInfo"
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:src="@drawable/ic_received_indicator"
                     android:layout_marginLeft="4sp"
-                    android:alpha="0.54"/>
-
-               
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_received_indicator" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
@@ -99,4 +97,4 @@
         android:scaleType="fitXY"
         android:src="@drawable/ic_profile" />
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index cb1c20fd..a34d3c6a 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -26,8 +26,9 @@
         <item>2 ordu</item>
         <item>8 ordu</item>
         <item>abisatu arte</item>
-        </string-array>
-        <integer-array name="mute_options_durations">
+    </string-array>
+
+    <integer-array name="mute_options_durations">
         <item>1800</item>
         <item>3600</item>
         <item>7200</item>
@@ -35,4 +36,4 @@
         <item>-1</item>
     </integer-array>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 72737284..4d3522fd 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -256,5 +256,5 @@
     <string name="pref_use_larger_font_summary">Letra tamaina handiagoa erabili aplikazio osoan zehar</string>
     <string name="pref_use_send_button_to_indicate_status">Bidaltze botoiak egoera adierazten du</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string>
-    
-</resources>
+
+</resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 024335f1..5af789c0 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -52,15 +52,9 @@
 
         <CheckBoxPreference
             android:dependency="show_notification"
-            android:key="notify_in_conversation_when_highlighted"
+            android:key="always_notify_in_conference"
             android:summary="@string/pref_conference_notifications_summary"
             android:title="@string/pref_conference_notifications" />
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:dependency="show_notification"
-            android:key="notification_grace_period_after_carbon_received"
-            android:summary="@string/pref_notification_grace_period_summary"
-            android:title="@string/pref_notification_grace_period" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_ui_options" >
         <CheckBoxPreference
-- 
cgit v1.2.3