am 0fe74b9f: Merge "[SetupWizardLib] Limit header lines" into ub-setupwizard-alatar

* commit '0fe74b9fc7ca5e89b5fddaae45e77650bc6f0f36':
  [SetupWizardLib] Limit header lines

2 files changed, 33 insertions, 1 deletions

diff --git a/library/main/res/values-land/styles.xml b/library/main/res/values-land/styles.xml
new file mode 100644
index 0000000..536a1dc
--- /dev/null
+++ b/library/main/res/values-land/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+
+    <!-- Card layout (for tablets) -->
+
+    <style name="SuwCardTitle" parent="SuwBaseCardTitle">
+        <item name="android:maxLines">6</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 2cb12db..f4e2798 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -37,7 +37,9 @@
 
     <!-- Card layout (for tablets) -->
 
-    <style name="SuwCardTitle">
+    <style name="SuwBaseCardTitle">
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">3</item>
         <item name="android:paddingBottom">@dimen/suw_card_title_padding_bottom</item>
         <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/suw_card_title_padding_end</item>
         <item name="android:paddingLeft">@dimen/suw_card_title_padding_start</item>
@@ -47,6 +49,8 @@
         <item name="android:textAppearance">@style/TextAppearance.SuwCardTitle</item>
     </style>
 
+    <style name="SuwCardTitle" parent="SuwBaseCardTitle" />
+
     <!-- Header layout (for phones) -->
 
     <style name="SuwHeaderTitle">
@@ -55,7 +59,9 @@
         <item name="android:layout_marginBottom">@dimen/suw_header_title_margin_bottom</item>
         <item name="android:layout_marginLeft">@dimen/suw_layout_margin_sides</item>
         <item name="android:layout_marginRight">@dimen/suw_layout_margin_sides</item>
+        <item name="android:ellipsize">end</item>
         <item name="android:lineSpacingExtra">@dimen/suw_header_title_line_spacing_extra</item>
+        <item name="android:maxLines">3</item>
         <item name="android:paddingBottom">@dimen/suw_header_title_padding_bottom</item>
         <item name="android:paddingTop">@dimen/suw_header_title_padding_top</item>
         <item name="android:textColor">@android:color/white</item>