From d6717ddccfb664cd60118e9ffc46f1258e28f502 Mon Sep 17 00:00:00 2001 From: Anna Galusza Date: Mon, 8 Feb 2016 23:28:40 +0000 Subject: [PATCH] Revert "Change style of Preview screens (dark borders with "preview" on the bottom)." to prevent merge conflict when this change is submitted into nyc-dev. This reverts commit 206a8457102c1a442b95609137998d32cc637974. Change-Id: I7a773fee68c28f3046a8099fa266183c3c3799ae --- res/drawable/preview_seek_bar_outline.xml | 22 ---- res/layout/font_size_activity.xml | 130 ++++++++++----------- res/layout/font_size_preview.xml | 1 - res/layout/preview_seek_bar_view_pager.xml | 50 -------- res/layout/screen_zoom_activity.xml | 128 ++++++++++---------- res/layout/screen_zoom_preview_1.xml | 91 ++++++++++----- res/layout/screen_zoom_preview_2.xml | 91 ++++++++++----- res/values/colors.xml | 4 - 8 files changed, 247 insertions(+), 270 deletions(-) delete mode 100644 res/drawable/preview_seek_bar_outline.xml delete mode 100644 res/layout/preview_seek_bar_view_pager.xml diff --git a/res/drawable/preview_seek_bar_outline.xml b/res/drawable/preview_seek_bar_outline.xml deleted file mode 100644 index acf92ef1edd..00000000000 --- a/res/drawable/preview_seek_bar_outline.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/res/layout/font_size_activity.xml b/res/layout/font_size_activity.xml index 85c81be2c1a..479a5f5412f 100644 --- a/res/layout/font_size_activity.xml +++ b/res/layout/font_size_activity.xml @@ -22,79 +22,79 @@ + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> - + + + + + + android:gravity="center_vertical" + android:paddingTop="8dp"> - + - + - - - - - - - - - - + + + diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml index 3959b15c7c8..5f2b10ff688 100644 --- a/res/layout/font_size_preview.xml +++ b/res/layout/font_size_preview.xml @@ -17,7 +17,6 @@ - - - - - - - - - - - diff --git a/res/layout/screen_zoom_activity.xml b/res/layout/screen_zoom_activity.xml index 4d3ab39069a..47c6b19c1df 100644 --- a/res/layout/screen_zoom_activity.xml +++ b/res/layout/screen_zoom_activity.xml @@ -22,78 +22,78 @@ + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> - + + + + + + android:gravity="center_vertical"> - + - + - - - - - - - - - - + + + diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml index 6762590f146..7cdb6639e7f 100644 --- a/res/layout/screen_zoom_preview_1.xml +++ b/res/layout/screen_zoom_preview_1.xml @@ -14,45 +14,72 @@ limitations under the License. --> - + + android:layout_height="?android:attr/actionBarSize" + android:orientation="horizontal" + android:theme="?android:attr/actionBarTheme" + style="?android:attr/actionBarStyle"> - - - - - - - - - - + android:text="@string/screen_zoom_preview_title" + android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title" /> + - + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/screen_zoom_preview_2.xml b/res/layout/screen_zoom_preview_2.xml index 6762590f146..7cdb6639e7f 100644 --- a/res/layout/screen_zoom_preview_2.xml +++ b/res/layout/screen_zoom_preview_2.xml @@ -14,45 +14,72 @@ limitations under the License. --> - + + android:layout_height="?android:attr/actionBarSize" + android:orientation="horizontal" + android:theme="?android:attr/actionBarTheme" + style="?android:attr/actionBarStyle"> - - - - - - - - - - + android:text="@string/screen_zoom_preview_title" + android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title" /> + - + + + + + + + + + + + + + + + + + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index 1e0927eb02b..579cd9eb7f5 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -111,8 +111,4 @@ #4285F4 #3367D6 - #fff - - #CC000000 -