Merge "Update styles for wait screens." into jb-ub-mail
diff --git a/res/layout-sw600dp/wait_for_manual_sync.xml b/res/layout-sw600dp/wait_for_manual_sync.xml
index 237cd50..37b5554 100644
--- a/res/layout-sw600dp/wait_for_manual_sync.xml
+++ b/res/layout-sw600dp/wait_for_manual_sync.xml
@@ -20,42 +20,38 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@android:color/white">
+ android:background="@android:color/white"
+ android:padding="@dimen/wait_padding">
<TextView
style="@style/WaitFragmentTitle"
android:text="@string/not_synced_title"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="32dip"
- android:gravity="center"/>
+ android:layout_height="wrap_content"/>
<TextView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"
android:text="@string/wait_for_manual_sync_body"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingTop="32dip"
- android:lineSpacingExtra="16dip"
- android:gravity="center" />
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="48dip"
- android:gravity="center">
+ android:orientation="vertical"
+ android:layout_gravity="right">
<Button android:id="@+id/manual_sync"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/manual_sync" />
+ android:text="@string/manual_sync"
+ android:layout_marginBottom="16dip" />
<Button android:id="@+id/change_sync_settings"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/change_sync_settings"
- android:layout_marginLeft="46dip" />
+ android:text="@string/change_sync_settings"/>
</LinearLayout>
diff --git a/res/layout-sw600dp/wait_for_sync.xml b/res/layout-sw600dp/wait_for_sync.xml
deleted file mode 100644
index d519902..0000000
--- a/res/layout-sw600dp/wait_for_sync.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 Google Inc.
- Licensed to 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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@android:color/white"
- android:layout_gravity="center" >
-
- <RelativeLayout android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:id="@+id/wait_for_sync_wrapper"
- android:visibility="visible" >
-
- <ProgressBar
- android:indeterminate="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="32dip"
- android:id="@+id/progress_spinner"
- android:layout_gravity="center"
- android:gravity="center"
- android:paddingTop="32dip" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/wait_for_sync_title"
- style="@style/WaitFragmentTitle"
- android:paddingLeft="48dip"
- android:paddingTop="32dip"
- android:id="@+id/wait_for_sync_title"
- android:layout_toRightOf="@id/progress_spinner" />
-
- <TextView
- android:paddingLeft="128dip"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/wait_for_sync_body"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingTop="32dip"
- android:lineSpacingExtra="16dip"
- android:layout_below="@id/wait_for_sync_title" />
- </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/wait_for_compose.xml b/res/layout/wait_for_compose.xml
index 95e06c5..2f56956 100644
--- a/res/layout/wait_for_compose.xml
+++ b/res/layout/wait_for_compose.xml
@@ -16,13 +16,11 @@
limitations under the License.
-->
- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
- android:gravity="center"
- android:layout_gravity="center"
- android:id="@+id/wait_for_sync_wrapper">
+ android:padding="@dimen/wait_padding">
<ProgressBar
android:indeterminate="true"
@@ -40,4 +38,4 @@
android:layout_marginTop="8dip"
android:textAppearance="?android:attr/textAppearanceLarge" />
- </RelativeLayout>
+</RelativeLayout>
diff --git a/res/layout/wait_for_manual_sync.xml b/res/layout/wait_for_manual_sync.xml
index 96fbc2a..0748a44 100644
--- a/res/layout/wait_for_manual_sync.xml
+++ b/res/layout/wait_for_manual_sync.xml
@@ -17,38 +17,34 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@android:color/white">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:background="@android:color/white"
+ android:padding="@dimen/wait_padding">
<TextView
style="@style/WaitFragmentTitle"
android:text="@string/not_synced_title"
- android:gravity="center"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="16dip"/>
+ android:layout_height="wrap_content"/>
<TextView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"
android:text="@string/wait_for_manual_sync_body"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_marginTop="32dip"
- android:layout_marginBottom="16dip"
- android:gravity="center"
- android:layout_marginLeft="4dip"
- android:layout_marginRight="4dip"/>
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
<Button android:id="@+id/manual_sync"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/manual_sync"/>
+ android:text="@string/manual_sync"
+ android:layout_marginBottom="16dip"/>
- <Button android:id="@+id/change_sync_settings"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/change_sync_settings" />
+ <Button android:id="@+id/change_sync_settings"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/change_sync_settings" />
</LinearLayout>
diff --git a/res/layout/wait_for_sync.xml b/res/layout/wait_for_sync.xml
index 56e6ae6..ffe9c79 100644
--- a/res/layout/wait_for_sync.xml
+++ b/res/layout/wait_for_sync.xml
@@ -16,43 +16,35 @@
limitations under the License.
-->
- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@android:color/white">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:padding="@dimen/wait_padding">
- <RelativeLayout android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:id="@+id/wait_for_sync_wrapper"
- android:layout_marginTop="16dip"
- android:layout_marginLeft="16dip"
- android:visibility="visible" >
+ <ProgressBar
+ android:indeterminate="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/progress_spinner"/>
- <ProgressBar
- android:indeterminate="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/progress_spinner"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/wait_for_sync_title"
+ style="@style/WaitFragmentTitle"
+ android:id="@+id/wait_for_sync_title"
+ android:layout_toRightOf="@id/progress_spinner"
+ android:layout_marginLeft="4dip"
+ android:layout_marginBottom="4dip"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/wait_for_sync_title"
- style="@style/WaitFragmentTitle"
- android:id="@+id/wait_for_sync_title"
- android:layout_toRightOf="@id/progress_spinner"
- android:layout_marginLeft="4dip" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/wait_for_sync_body"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_below="@id/wait_for_sync_title"
- android:layout_toRightOf="@id/progress_spinner"
- android:layout_marginLeft="4dip" />
- </RelativeLayout>
-
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/wait_for_sync_body"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_below="@id/wait_for_sync_title"
+ android:layout_toRightOf="@id/progress_spinner"
+ android:layout_marginLeft="4dip" />
</RelativeLayout>
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 725798e..d980bd3 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -47,4 +47,5 @@
<dimen name="compose_area_right_padding">100dip</dimen>
<dimen name="search_view_width">500dip</dimen>
<dimen name="attachment_tile_min_size">180dp</dimen>
+ <dimen name="wait_padding">32dp</dimen>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 096fcb1..0f7fce3 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -54,10 +54,6 @@
<item name="android:textColor">@color/conv_header_text_light</item>
</style>
- <style name="WaitFragmentTitle" parent="@android:style/Widget.Holo.TextView">
- <item name="android:textSize">30sp</item>
- </style>
-
<style name="AccountSpinnerAnchorTextPrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
</style>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 9ba1f46..3cf50a9 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -98,4 +98,5 @@
<dimen name="attachment_tile_min_size">120dp</dimen>
<dimen name="toast_bar_bottom_margin_in_conversation">24dip</dimen>
<dimen name="undo_animation_offset">600dp</dimen>
+ <dimen name="wait_padding">16dp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6cbe36e..46a5f72 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -401,7 +401,9 @@
</style>
<style name="WaitFragmentTitle" parent="@android:style/Widget.Holo.TextView">
- <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+ <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
+ <item name="android:textColor">@android:color/black</item>
+ <item name="android:layout_marginBottom">8dip</item>
</style>
<style name="NotificationPrimaryText">