From 387acfe8033a72fd40aacd66f2bc87febc81cf8b Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 30 Nov 2016 14:59:04 -0800
Subject: [PATCH] [SuwLib] Set baseline align to false

Test: (Manual) Lint stops complaining. Visually looks the same.
Bug: 33106412
Change-Id: I0dfd39338b32ef00ab64818f75bf242e183fba74
---
 library/main/res/layout/suw_items_default.xml     | 5 ++---
 library/main/res/layout/suw_items_description.xml | 4 ++--
 library/main/res/layout/suw_items_verbose.xml     | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/library/main/res/layout/suw_items_default.xml b/library/main/res/layout/suw_items_default.xml
index 0a1b975..68ae2b0 100644
--- a/library/main/res/layout/suw_items_default.xml
+++ b/library/main/res/layout/suw_items_default.xml
@@ -20,9 +20,8 @@
     style="@style/SuwItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:ignore="DisableBaselineAlignment">
-    <!-- TODO: Investigate if baseline alignment can be disabled -->
+    android:baselineAligned="false"
+    android:orientation="horizontal">
 
     <FrameLayout
         android:id="@+id/suw_items_icon_container"
diff --git a/library/main/res/layout/suw_items_description.xml b/library/main/res/layout/suw_items_description.xml
index 8b82f43..391ed0e 100644
--- a/library/main/res/layout/suw_items_description.xml
+++ b/library/main/res/layout/suw_items_description.xml
@@ -20,10 +20,10 @@
     style="?attr/suwItemDescriptionStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:baselineAligned="false"
     android:orientation="horizontal"
-    tools:ignore="DisableBaselineAlignment,UnusedResources">
+    tools:ignore="UnusedResources">
     <!-- Ignore UnusedResources: can be used by clients -->
-    <!-- TODO: Investigate if baseline alignment can be disabled -->
 
     <FrameLayout
         android:id="@+id/suw_items_icon_container"
diff --git a/library/main/res/layout/suw_items_verbose.xml b/library/main/res/layout/suw_items_verbose.xml
index 3a2edd5..5248b90 100644
--- a/library/main/res/layout/suw_items_verbose.xml
+++ b/library/main/res/layout/suw_items_verbose.xml
@@ -20,10 +20,10 @@
     style="@style/SuwItemContainer.Verbose"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:baselineAligned="false"
     android:orientation="horizontal"
-    tools:ignore="DisableBaselineAlignment,UnusedResources">
+    tools:ignore="UnusedResources">
     <!-- Ignore UnusedResources: can be used by clients -->
-    <!-- TODO: Investigate if baseline alignment can be disabled -->
 
     <FrameLayout
         android:id="@+id/suw_items_icon_container"