From d658c0f6af58596219d1d90f13627f8d88f1793b Mon Sep 17 00:00:00 2001
From: Anna Galusza <agalusza@google.com>
Date: Wed, 9 Mar 2016 14:50:27 -0800
Subject: [PATCH] Update preview border. Bug: 27396174

Change-Id: I23d24246eb7a571db4548965c77428532da0b59a
---
 res/drawable/preview_seek_bar_outline.xml  | 31 +++++++++++++++++-----
 res/layout/preview_seek_bar_view_pager.xml | 31 ++++++++--------------
 res/values/colors.xml                      |  2 --
 res/values/dimens.xml                      |  3 +++
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/res/drawable/preview_seek_bar_outline.xml b/res/drawable/preview_seek_bar_outline.xml
index acf92ef1edd..ef8b8c72ed2 100644
--- a/res/drawable/preview_seek_bar_outline.xml
+++ b/res/drawable/preview_seek_bar_outline.xml
@@ -14,9 +14,28 @@
      limitations under the License.
 -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-        android:shape="rectangle" >
-        <stroke
-            android:width="8dp"
-            android:color="@color/seek_bar_preference_preview_border_tint" />
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="0dp"
+        android:bottom="0dp"
+        android:right="0dp"
+        android:left="0dp" >
+        <shape
+            android:shape="rectangle" >
+            <stroke
+                android:width="@dimen/preview_pager_padding"
+                android:color="?android:attr/colorPrimary" />
+        </shape>
+    </item>
+    <item
+        android:bottom="0dp"
+        android:right="0dp"
+        android:left="0dp" >
+        <shape
+            android:shape="rectangle"
+            android:height="?android:attr/actionBarSize" >
+            <solid
+                android:color="?android:attr/colorPrimary" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/res/layout/preview_seek_bar_view_pager.xml b/res/layout/preview_seek_bar_view_pager.xml
index 72aee10e9ec..d6c1698b4e9 100644
--- a/res/layout/preview_seek_bar_view_pager.xml
+++ b/res/layout/preview_seek_bar_view_pager.xml
@@ -14,37 +14,28 @@
      limitations under the License.
 -->
 
-<RelativeLayout 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="0dp"
     android:layout_weight="1"
-    android:foreground="@drawable/preview_seek_bar_outline" >
+    android:orientation="vertical"
+    android:padding="@dimen/preview_pager_padding"
+    android:background="@drawable/preview_seek_bar_outline" >
 
     <android.support.v4.view.ViewPager
         android:id="@+id/preview_pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:background="?android:attr/colorBackgroundFloating" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_alignParentTop="false"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="8dp"
-        android:background="@color/seek_bar_preference_preview_border_tint" />
-
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
-        android:layout_marginStart="32dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="false"
-        android:layout_alignParentBottom="true"
-        android:gravity="center"
+        android:paddingStart="32dp"
+        android:gravity="start|center"
         android:text="@string/screen_zoom_preview_title"
         android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"
-        android:textColor="@color/seek_bar_preference_preview_text"
-        android:elevation="2dp"/>
-</RelativeLayout>
+        android:textColor="@color/seek_bar_preference_preview_text" />
+</LinearLayout>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f27b693bf5c..34ca866116a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -124,7 +124,5 @@
     <color name="message_icon_text_outgoing">#ffffffff</color>
 
     <color name="seek_bar_preference_preview_text">#fff</color>
-    <!-- Black at 80% opacity -->
-    <color name="seek_bar_preference_preview_border_tint">#cc000000</color>
 
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index af3a0c14d43..d302d6d271f 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -291,4 +291,7 @@
     <!-- Restricted icon in switch bar -->
     <dimen name="restricted_icon_margin_end">16dp</dimen>
 
+    <!-- Display Size and Font Size preview screen -->
+    <dimen name="preview_pager_padding">8dp</dimen>
+
 </resources>