From b111b9943b232027ae9d66c896833bbc59252daa Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Tue, 29 Jan 2019 15:44:23 -0800
Subject: [PATCH] Closes #273 - Wrap session placeholder text

---
 .../main/res/layout/session_list_empty.xml    | 24 ++++++++++---------
 app/src/main/res/values/strings.xml           |  4 +---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/session_list_empty.xml b/app/src/main/res/layout/session_list_empty.xml
index c5ddb9b30..d8134f898 100644
--- a/app/src/main/res/layout/session_list_empty.xml
+++ b/app/src/main/res/layout/session_list_empty.xml
@@ -2,31 +2,33 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/no_sessions"
-        android:background="@drawable/session_list_empty_bg"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/no_sessions"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/session_list_empty_bg"
+    android:padding="16dp">
 
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="44dp"
         android:layout_height="60dp"
+        android:gravity="center_vertical"
         android:src="@drawable/ic_sessions_intro"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="23dp"
+        android:ellipsize="none"
         android:gravity="center_vertical"
-        android:textSize="16sp"
+        android:scrollHorizontally="false"
         android:text="@string/sessions_intro_description"
         android:textColor="@color/session_list_empty_fg"
-        android:layout_marginStart="23dp"
+        android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="@id/imageView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/imageView"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 983765724..2ebb97ec1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,9 +20,7 @@
     <string name="browser_menu_private_tab">Private Tab</string>
     <string name="browser_menu_new_tab">New Tab</string>
     <string name="browser_menu_report_issue">Report Issue</string>
-    <string name="sessions_intro_description">Fenix will collect your browsing sessions\n on your Home Screen for you to
-        retrieve\n later.
-    </string>
+    <string name="sessions_intro_description">Fenix will collect your browsing sessions on your Home Screen for you to retrieve later.</string>
     <string name="search_scan_button">Scan</string>
     <string name="search_shortcuts_button">Shortcuts</string>
 </resources>