From 0e3c7dbdfc98fb9e79c4b2564be3fbade8896acf Mon Sep 17 00:00:00 2001
From: Alex Hills <ahills@google.com>
Date: Tue, 13 Oct 2015 13:04:57 -0400
Subject: Modifies wear Permission title height to avoid clipping

We were explicitly setting the height of the permission
screen title, which wasn't 100% guaranteed to work in all
languages. This change sets minHeight (to maintain
UI consistency) instead, and changes the height to
wrap_content to enable it to expand further if necessary.

Bug:24774285
Bug:24391658
Change-Id: Icf25ad6a176537b0f34a30f53220c73fccec2d24
---
 res/layout-watch/settings_internal.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout-watch/settings_internal.xml b/res/layout-watch/settings_internal.xml
index afedcf47..fdd21cef 100644
--- a/res/layout-watch/settings_internal.xml
+++ b/res/layout-watch/settings_internal.xml
@@ -17,7 +17,8 @@
     <TextView
         android:id="@+id/header"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/settings_header_base_height"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/settings_header_base_height"
         android:layout_marginLeft="16dp"
         android:layout_marginTop="@dimen/settings_header_top_margin"
         android:textSize="@dimen/setting_short_header_text_size"
-- 
cgit v1.2.3