From 7dbae837dedd90f3dbc1b6eafc8ef00c794234fd Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Wed, 22 Mar 2017 12:47:54 -0400
Subject: [PATCH] modify notification display

---
 .../layout-v21/layout_notification_expanded.xml  |  4 ++--
 .../res/layout/layout_notification_expanded.xml  | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout-v21/layout_notification_expanded.xml b/app/src/main/res/layout-v21/layout_notification_expanded.xml
index 179b95ec..e5a75efc 100644
--- a/app/src/main/res/layout-v21/layout_notification_expanded.xml
+++ b/app/src/main/res/layout-v21/layout_notification_expanded.xml
@@ -73,7 +73,7 @@
                 android:singleLine="true"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
-				android:textAppearance="@style/NotificationText"                
+				android:textAppearance="@style/NotificationTitle"
                 />
             <TextView android:id="@+id/info"
                 android:layout_width="wrap_content"
@@ -83,7 +83,7 @@
                 android:singleLine="true"
                 android:gravity="center"
                 android:paddingStart="8dp"
-				android:textAppearance="@style/NotificationText"
+				android:textAppearance="@style/NotificationTitle"
                 />
             <ImageView android:id="@+id/right_icon"
                 android:layout_width="16dp"
diff --git a/orbotservice/src/main/res/layout/layout_notification_expanded.xml b/orbotservice/src/main/res/layout/layout_notification_expanded.xml
index c2a9c9ef..395998b1 100644
--- a/orbotservice/src/main/res/layout/layout_notification_expanded.xml
+++ b/orbotservice/src/main/res/layout/layout_notification_expanded.xml
@@ -30,9 +30,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="fill_vertical"
         android:layout_marginStart="@dimen/notification_large_icon_width"
+        android:layout_marginLeft="@dimen/notification_large_icon_width"
+
         android:minHeight="@dimen/notification_large_icon_height"
         android:orientation="vertical"
         android:paddingEnd="8dp"
+        android:paddingRight="8dp"
         android:paddingTop="2dp"
         android:paddingBottom="2dp"
         android:gravity="top"
@@ -43,6 +46,7 @@
             android:layout_height="wrap_content"
             android:paddingTop="6dp"
             android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
             android:orientation="horizontal"
             >
             <TextView android:id="@+id/title"
@@ -53,7 +57,6 @@
                 android:fadingEdge="horizontal"
                 android:layout_weight="1"
                 android:textStyle="bold"
- 				android:textAppearance="@style/NotificationTitle"
                  />
             
         </LinearLayout>
@@ -62,7 +65,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"       
-            android:layout_marginStart="8dp"                
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
             >
             <TextView android:id="@+id/text"
                 android:layout_width="0dp"
@@ -72,7 +76,6 @@
                 android:singleLine="true"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
-				android:textAppearance="@style/NotificationText"                
                 />
             <TextView android:id="@+id/info"
                 android:layout_width="wrap_content"
@@ -82,14 +85,14 @@
                 android:singleLine="true"
                 android:gravity="center"
                 android:paddingStart="8dp"
-				android:textAppearance="@style/NotificationText"
+                android:paddingLeft="8dp"
                 />
             <ImageView android:id="@+id/right_icon"
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_gravity="center"
                 android:layout_weight="0"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:scaleType="centerInside"
                 android:visibility="gone"
                 />
@@ -115,7 +118,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="-2dp"
             android:layout_marginBottom="-2dp"
-            android:layout_marginStart="8dp"            
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
             android:fadingEdge="horizontal"        
             />
     </LinearLayout>