Merge remote-tracking branch 'origin/master' into feature/custom-vector-source

1 files changed, 13 insertions, 12 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml
index 93af094e3f..b290d013f0 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="72dp"
     android:background="?android:attr/selectableItemBackground"
     android:orientation="vertical"
+    android:paddingEnd="16dp"
     android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:paddingStart="16dp"
     android:paddingTop="16dp">
 
@@ -12,24 +15,22 @@
         android:id="@+id/nameView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:text="Dummy headline"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
-        android:singleLine="true"
+        android:layout_marginRight="16dp"
+        android:gravity="center_vertical"
+        android:maxLines="1"
         android:textColor="@android:color/black"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
     <TextView
         android:id="@+id/descriptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:alpha="0.56"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
-        android:singleLine="true"
-        android:text="Description is dummy dummy"
+        android:layout_marginRight="16dp"
+        android:alpha="0.56"
+        android:maxLines="1"
         android:textColor="@android:color/black"
-        android:textSize="14sp" />
+        android:textSize="14sp"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>