am 075e4e3d: Merge "Increase string lengths" into jb-mr2-dev
* commit '075e4e3d56b725d87eb2037d88192e2cdf1f1379':
Increase string lengths
diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml
index b1b46cf..bde0a0a 100644
--- a/res/layout/conversation_item_view_normal.xml
+++ b/res/layout/conversation_item_view_normal.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2011 Google Inc.
+ Copyright (C) 2013 Google Inc.
Licensed to The Android Open Source Project.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,66 +24,128 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="@dimen/conversation_item_height"
+ android:layout_height="wrap_content"
android:orientation="vertical">
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical">
- <View
- android:id="@+id/spacer"
- android:layout_width="24dp"
- android:layout_height="24dp"
- />
- <TextView
- android:id="@+id/senders"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/SendersStyle"
- android:text="@string/long_string"
- android:textSize="@dimen/senders_font_size"
- android:lines="1"
- android:layout_toRightOf="@id/spacer" />
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="@dimen/total_conversationbar_width"
- android:layout_alignParentRight="true">
- <ImageView
- android:id="@+id/paperclip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_attachment_holo_light"
- android:layout_marginTop="6sp" />
- <TextView
- android:id="@+id/date"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:text="@string/long_string"
- android:textSize="@dimen/date_font_size"
- android:lines="1"
- android:layout_marginRight="16dip"
- android:layout_marginTop="10sp" />
- </LinearLayout>
- </RelativeLayout>
+
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:orientation="horizontal">
+
<ImageView
- style="@style/CheckmarkStyle"
android:id="@+id/checkmark"
- android:src="@drawable/btn_check_on_normal_holo_light"/>
- <TextView
- android:id="@+id/subject"
- android:layout_width="@dimen/subject_width"
- style="@style/SubjectStyle"
- android:text="@string/long_string"
- android:lines="2"/>
- <ImageView
- android:id="@+id/star"
- style="@style/StarStyle"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="12dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/btn_check_on_normal_holo_light" />
+
+ <View
+ android:id="@+id/contact_image"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_marginRight="12dp"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="12dp" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <!-- these views overlap horizontally, that's okay. -->
+ <!-- we are only interested in the left edge of senders and the right edge -->
+ <!-- of the date. -->
+ <!-- sendersWidth, clipX, and dateX are dynamically determined later. -->
+
+ <!-- for Email -->
+ <!-- top margin should be 12dp, but the asset has 2dp built-in padding -->
+ <ImageView
+ android:id="@+id/reply_state"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_marginRight="8dp"
+ android:src="@drawable/ic_badge_reply_holo_light" />
+
+ <TextView
+ android:id="@+id/senders"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/reply_state"
+ android:layout_marginTop="12dp"
+ android:textSize="18sp"
+ android:lines="1"
+ android:includeFontPadding="false"
+ android:text="@string/long_string" />
+
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_marginTop="12dp"
+ android:paddingLeft="8dp"
+ android:textSize="12sp"
+ android:lines="1"
+ android:includeFontPadding="false"
+ android:text="@string/long_string" />
+
+ <!-- top margin should be 12dp, but the asset has 8dp built-in padding -->
+ <!-- left padding should be 8dp, but the asset has 2dp built-in padding -->
+ <ImageView
+ android:id="@+id/paperclip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toLeftOf="@id/date"
+ android:layout_marginTop="4dp"
+ android:paddingLeft="6dp"
+ android:src="@drawable/ic_attachment_holo_light" />
+
+ <!-- for Email -->
+ <View android:id="@+id/color_block"
+ android:layout_width="@dimen/color_block_width"
+ android:layout_height="@dimen/color_block_height"
+ android:layout_alignParentRight="true" />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="12dp">
+
+ <ImageView
+ android:id="@+id/star"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:src="@drawable/btn_star_off_normal_email_holo_light" />
+
+ <!-- we assume the star asset is less than 48dp wide -->
+ <TextView
+ android:id="@+id/subject"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="48dp"
+ android:lines="2"
+ android:textSize="14sp"
+ android:includeFontPadding="false"
+ android:text="@string/long_string" />
+
+ </RelativeLayout>
+
+ </LinearLayout>
+
</LinearLayout>
+
<ImageView
android:id="@+id/attachment_previews"
android:layout_width="match_parent"
@@ -92,4 +154,18 @@
android:layout_marginLeft="@dimen/attachment_preview_margin_side"
android:layout_marginRight="@dimen/attachment_preview_margin_side"
android:visibility="gone" />
+
+ <TextView
+ android:id="@+id/folders"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-8dp"
+ android:layout_marginBottom="1dp"
+ android:fontFamily="sans-serif-light"
+ android:includeFontPadding="false"
+ android:text="@string/long_string"
+ android:textSize="11sp"
+ android:lines="1"
+ android:minHeight="16dp" />
+
</LinearLayout>
diff --git a/res/layout/conversation_item_view_normal2.xml b/res/layout/conversation_item_view_normal2.xml
deleted file mode 100644
index bde0a0a..0000000
--- a/res/layout/conversation_item_view_normal2.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 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.
--->
-
-<!-- This layout is used as a template to create custom view CanvasConversationHeaderView
- in normal mode. To be able to get the correct measurements, every source field should
- be populated with data here. E.g:
- - Text View should set text to a random long string (android:text="@string/long_string")
- - Image View should set source to a specific asset -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/checkmark"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="12dp"
- android:layout_gravity="center_vertical"
- android:src="@drawable/btn_check_on_normal_holo_light" />
-
- <View
- android:id="@+id/contact_image"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_marginRight="12dp"
- android:layout_marginTop="12dp"
- android:layout_marginBottom="12dp" />
-
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical">
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <!-- these views overlap horizontally, that's okay. -->
- <!-- we are only interested in the left edge of senders and the right edge -->
- <!-- of the date. -->
- <!-- sendersWidth, clipX, and dateX are dynamically determined later. -->
-
- <!-- for Email -->
- <!-- top margin should be 12dp, but the asset has 2dp built-in padding -->
- <ImageView
- android:id="@+id/reply_state"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_marginRight="8dp"
- android:src="@drawable/ic_badge_reply_holo_light" />
-
- <TextView
- android:id="@+id/senders"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@id/reply_state"
- android:layout_marginTop="12dp"
- android:textSize="18sp"
- android:lines="1"
- android:includeFontPadding="false"
- android:text="@string/long_string" />
-
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_marginTop="12dp"
- android:paddingLeft="8dp"
- android:textSize="12sp"
- android:lines="1"
- android:includeFontPadding="false"
- android:text="@string/long_string" />
-
- <!-- top margin should be 12dp, but the asset has 8dp built-in padding -->
- <!-- left padding should be 8dp, but the asset has 2dp built-in padding -->
- <ImageView
- android:id="@+id/paperclip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toLeftOf="@id/date"
- android:layout_marginTop="4dp"
- android:paddingLeft="6dp"
- android:src="@drawable/ic_attachment_holo_light" />
-
- <!-- for Email -->
- <View android:id="@+id/color_block"
- android:layout_width="@dimen/color_block_width"
- android:layout_height="@dimen/color_block_height"
- android:layout_alignParentRight="true" />
-
- </RelativeLayout>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dp">
-
- <ImageView
- android:id="@+id/star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
-
- <!-- we assume the star asset is less than 48dp wide -->
- <TextView
- android:id="@+id/subject"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="48dp"
- android:lines="2"
- android:textSize="14sp"
- android:includeFontPadding="false"
- android:text="@string/long_string" />
-
- </RelativeLayout>
-
- </LinearLayout>
-
- </LinearLayout>
-
- <ImageView
- android:id="@+id/attachment_previews"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginTop="@dimen/attachment_preview_margin_top"
- android:layout_marginLeft="@dimen/attachment_preview_margin_side"
- android:layout_marginRight="@dimen/attachment_preview_margin_side"
- android:visibility="gone" />
-
- <TextView
- android:id="@+id/folders"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="-8dp"
- android:layout_marginBottom="1dp"
- android:fontFamily="sans-serif-light"
- android:includeFontPadding="false"
- android:text="@string/long_string"
- android:textSize="11sp"
- android:lines="1"
- android:minHeight="16dp" />
-
-</LinearLayout>
diff --git a/res/layout/conversation_item_view_normal_images.xml b/res/layout/conversation_item_view_normal_images.xml
deleted file mode 100644
index 64d6b20..0000000
--- a/res/layout/conversation_item_view_normal_images.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2011 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.
--->
-
-<!-- This is a placeholder layout is used as a template to create custom view
- CanvasConversationHeaderView in normal mode when showing sender pictures. To be able
- to get the correct measurements, every source field should be populated with data here. E.g:
- - Text View should set text to a random long string (android:text="@string/long_string")
- - Image View should set source to a specific asset -->
-<FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <include layout="@layout/conversation_item_view_normal"/>
-</FrameLayout>
diff --git a/res/layout/conversation_item_view_wide.xml b/res/layout/conversation_item_view_wide.xml
index 4f47f31..0f6c607 100644
--- a/res/layout/conversation_item_view_wide.xml
+++ b/res/layout/conversation_item_view_wide.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2011 Google Inc.
+ Copyright (C) 2013 Google Inc.
Licensed to The Android Open Source Project.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
-->
<!-- This layout is used as a template to create custom view CanvasConversationHeaderView
- in wide mode. To be able to get the correct measurements, every source field should
+ in normal mode. To be able to get the correct measurements, every source field should
be populated with data here. E.g:
- Text View should set text to a random long string (android:text="@string/long_string")
- Image View should set source to a specific asset -->
@@ -25,75 +25,121 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="@dimen/conversation_item_height_wide"
- android:orientation="vertical" >
- <LinearLayout
+ android:orientation="vertical">
+
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal">
- <ImageView
- android:id="@+id/checkmark"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_gravity="center_vertical"
- android:src="@drawable/btn_check_on_normal_holo_light" />
- <TextView
- android:id="@+id/senders"
- android:layout_width="224dip"
- android:layout_height="wrap_content"
- android:text="@string/long_string"
- android:textSize="@dimen/wide_senders_font_size"
- android:layout_gravity="center_vertical"
- android:maxLines="1"
- android:layout_marginTop="@dimen/wide_senders_margin_top" />
- <TextView
- android:id="@+id/subject"
- android:layout_width="0dip"
- android:layout_weight="0.7"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/long_string"
- android:lines="2"
- android:textColor="@color/subject_text_color_unread"
- android:textSize="@dimen/wide_subject_font_size"
- android:layout_marginTop="2sp"
- android:layout_marginRight="@dimen/wide_subject_margin_right"/>
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="32dp">
+
<LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="vertical">
- <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:minHeight="66dp"
+ android:gravity="center_vertical">
+
+ <ImageView
+ android:id="@+id/checkmark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_gravity="center_vertical">
+ android:layout_marginRight="20dp"
+ android:src="@drawable/btn_check_on_normal_holo_light" />
+
+ <View
+ android:id="@+id/contact_image"
+ android:layout_width="46dp"
+ android:layout_height="46dp"
+ android:layout_marginRight="20dp"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="12dp" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:baselineAligned="false"
+ android:gravity="top"
+ android:orientation="horizontal">
+
+ <!-- for Email -->
+ <!-- cancel out the asset's 2dp built-in padding -->
+ <ImageView
+ android:id="@+id/reply_state"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-2dp"
+ android:layout_marginRight="8dp"
+ android:src="@drawable/ic_badge_reply_holo_light" />
+
+ <TextView
+ android:id="@+id/senders"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginRight="27dp"
+ android:textSize="18sp"
+ android:lines="1"
+ android:includeFontPadding="false"
+ android:text="@string/long_string" />
+
+ <TextView
+ android:id="@+id/subject"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:layout_marginLeft="27dp"
+ android:lines="2"
+ android:textSize="14sp"
+ android:includeFontPadding="false"
+ android:text="@string/long_string" />
+
+ <!-- cancel out the asset's 8dp built-in top padding -->
+ <!-- left padding should be 8dp, but the asset has 2dp built-in padding -->
<ImageView
android:id="@+id/paperclip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_attachment_holo_light"
- android:layout_gravity="center_vertical"
- android:layout_marginTop="@dimen/wide_attachment_margin_top"/>
+ android:layout_marginTop="-8dp"
+ android:paddingLeft="6dp"
+ android:src="@drawable/ic_attachment_holo_light" />
+
+ <!-- The date should never appear truncated. -->
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/date"
- android:layout_marginTop="@dimen/wide_date_margin_top" />
+ android:paddingLeft="8dp"
+ android:textSize="12sp"
+ android:lines="1"
+ android:includeFontPadding="false"
+ android:text="@string/date" />
+
+ <!-- align to date -->
+ <ImageView
+ android:id="@+id/star"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-12dp"
+ android:layout_marginLeft="32dp"
+ android:src="@drawable/btn_star_off_normal_email_holo_light" />
+
</LinearLayout>
+
</LinearLayout>
- <ImageView
- android:id="@+id/star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_gravity="center_vertical"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
- </LinearLayout>
+
+ <!-- for Email -->
+ <!-- aligned to be above the date (32dp(star asset) + 32dp(star left margin) = 64dp) -->
+ <View android:id="@+id/color_block"
+ android:layout_width="@dimen/color_block_width"
+ android:layout_height="@dimen/color_block_height"
+ android:layout_marginRight="64dp"
+ android:layout_gravity="top|right" />
+
+ </FrameLayout>
+
<ImageView
android:id="@+id/attachment_previews"
android:layout_width="match_parent"
@@ -102,4 +148,18 @@
android:layout_marginLeft="@dimen/attachment_preview_margin_side"
android:layout_marginRight="@dimen/attachment_preview_margin_side"
android:visibility="gone" />
+
+ <TextView
+ android:id="@+id/folders"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-8dp"
+ android:layout_marginBottom="1dp"
+ android:fontFamily="sans-serif-light"
+ android:includeFontPadding="false"
+ android:text="@string/long_string"
+ android:textSize="12sp"
+ android:lines="1"
+ android:minHeight="16dp" />
+
</LinearLayout>
diff --git a/res/layout/conversation_item_view_wide2.xml b/res/layout/conversation_item_view_wide2.xml
deleted file mode 100644
index 0f6c607..0000000
--- a/res/layout/conversation_item_view_wide2.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 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.
--->
-
-<!-- This layout is used as a template to create custom view CanvasConversationHeaderView
- in normal mode. To be able to get the correct measurements, every source field should
- be populated with data here. E.g:
- - Text View should set text to a random long string (android:text="@string/long_string")
- - Image View should set source to a specific asset -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="32dp">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:minHeight="66dp"
- android:gravity="center_vertical">
-
- <ImageView
- android:id="@+id/checkmark"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="20dp"
- android:src="@drawable/btn_check_on_normal_holo_light" />
-
- <View
- android:id="@+id/contact_image"
- android:layout_width="46dp"
- android:layout_height="46dp"
- android:layout_marginRight="20dp"
- android:layout_marginTop="12dp"
- android:layout_marginBottom="12dp" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_marginBottom="10dp"
- android:baselineAligned="false"
- android:gravity="top"
- android:orientation="horizontal">
-
- <!-- for Email -->
- <!-- cancel out the asset's 2dp built-in padding -->
- <ImageView
- android:id="@+id/reply_state"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="-2dp"
- android:layout_marginRight="8dp"
- android:src="@drawable/ic_badge_reply_holo_light" />
-
- <TextView
- android:id="@+id/senders"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginRight="27dp"
- android:textSize="18sp"
- android:lines="1"
- android:includeFontPadding="false"
- android:text="@string/long_string" />
-
- <TextView
- android:id="@+id/subject"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="2"
- android:layout_marginLeft="27dp"
- android:lines="2"
- android:textSize="14sp"
- android:includeFontPadding="false"
- android:text="@string/long_string" />
-
- <!-- cancel out the asset's 8dp built-in top padding -->
- <!-- left padding should be 8dp, but the asset has 2dp built-in padding -->
- <ImageView
- android:id="@+id/paperclip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="-8dp"
- android:paddingLeft="6dp"
- android:src="@drawable/ic_attachment_holo_light" />
-
- <!-- The date should never appear truncated. -->
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:textSize="12sp"
- android:lines="1"
- android:includeFontPadding="false"
- android:text="@string/date" />
-
- <!-- align to date -->
- <ImageView
- android:id="@+id/star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="-12dp"
- android:layout_marginLeft="32dp"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
-
- </LinearLayout>
-
- </LinearLayout>
-
- <!-- for Email -->
- <!-- aligned to be above the date (32dp(star asset) + 32dp(star left margin) = 64dp) -->
- <View android:id="@+id/color_block"
- android:layout_width="@dimen/color_block_width"
- android:layout_height="@dimen/color_block_height"
- android:layout_marginRight="64dp"
- android:layout_gravity="top|right" />
-
- </FrameLayout>
-
- <ImageView
- android:id="@+id/attachment_previews"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginTop="@dimen/attachment_preview_margin_top"
- android:layout_marginLeft="@dimen/attachment_preview_margin_side"
- android:layout_marginRight="@dimen/attachment_preview_margin_side"
- android:visibility="gone" />
-
- <TextView
- android:id="@+id/folders"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="-8dp"
- android:layout_marginBottom="1dp"
- android:fontFamily="sans-serif-light"
- android:includeFontPadding="false"
- android:text="@string/long_string"
- android:textSize="12sp"
- android:lines="1"
- android:minHeight="16dp" />
-
-</LinearLayout>
diff --git a/res/layout/conversation_item_view_wide_images.xml b/res/layout/conversation_item_view_wide_images.xml
deleted file mode 100644
index c7b2f21..0000000
--- a/res/layout/conversation_item_view_wide_images.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2011 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.
--->
-
-<!-- This is a placeholder layout is used as a template to create custom view
- CanvasConversationHeaderView in wide mode when showing sender pictures. To be able to get the
- correct measurements, every source field should be populated with data here. E.g:
- - Text View should set text to a random long string (android:text="@string/long_string")
- - Image View should set source to a specific asset -->
-<FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <include layout="@layout/conversation_item_view_wide"/>
-</FrameLayout>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0fd8690..866e23f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Vouers"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Geen verbinding nie"</string>
<string name="loading" msgid="2600808404156989255">"Laai tans gesprekke…"</string>
<string name="retry" msgid="4515885444824418022">"Herprobeer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3fe62d3..200e171 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"አቃፊዎች"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"ምንም ግንኙነት የለም"</string>
<string name="loading" msgid="2600808404156989255">"ውይይቶች በመስቀል ላይ..."</string>
<string name="retry" msgid="4515885444824418022">"እንደገና ሞክር"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7a0689c..8ee0517b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"المجلدات"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"ليس هناك اتصال"</string>
<string name="loading" msgid="2600808404156989255">"جارٍ تحميل المحادثات..."</string>
<string name="retry" msgid="4515885444824418022">"إعادة المحاولة"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 63755c9..a2d6d68 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Тэчкі"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Няма злучэння"</string>
<string name="loading" msgid="2600808404156989255">"Загрузка размоў..."</string>
<string name="retry" msgid="4515885444824418022">"Паўтарыць"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c80a2a3..9a159d0 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Папки"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Няма връзка"</string>
<string name="loading" msgid="2600808404156989255">"Коресп. се зареждат…"</string>
<string name="retry" msgid="4515885444824418022">"Нов опит"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 140e5d6..080e2c3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Carpetes"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Sense connexió"</string>
<string name="loading" msgid="2600808404156989255">"Carreg. converses..."</string>
<string name="retry" msgid="4515885444824418022">"Torna-ho a provar"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f082274..b066ff8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Složky"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Žádné připojení"</string>
<string name="loading" msgid="2600808404156989255">"Načítání konverzací…"</string>
<string name="retry" msgid="4515885444824418022">"Opakovat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f8e1549..2e71517 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mapper"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Ingen forbindelse"</string>
<string name="loading" msgid="2600808404156989255">"Indlæser samtaler…"</string>
<string name="retry" msgid="4515885444824418022">"Prøv igen"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f2856a8..8dc0c69 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Ordner"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Keine Verbindung"</string>
<string name="loading" msgid="2600808404156989255">"Konversationen werden geladen…"</string>
<string name="retry" msgid="4515885444824418022">"Erneut versuchen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0010e6f..e977622 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Φάκελοι"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Δεν υπάρχει σύνδεση"</string>
<string name="loading" msgid="2600808404156989255">"Φόρτ. συνομιλιών…"</string>
<string name="retry" msgid="4515885444824418022">"Επανάληψη"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4f31e1a..579862e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -313,7 +313,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Folders"</string>
- <string name="toggle_drawer" msgid="4937513687658162188">"Toggle drawer"</string>
<string name="network_error" msgid="2125579009654728299">"No connection"</string>
<string name="loading" msgid="2600808404156989255">"Loading conversations…"</string>
<string name="retry" msgid="4515885444824418022">"Retry"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5978440..b1eaa51 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Carpetas"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Sin conexión"</string>
<string name="loading" msgid="2600808404156989255">"Cargando…"</string>
<string name="retry" msgid="4515885444824418022">"Volver a intentar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8af1beb..a70ae2f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Carpetas"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Sin conexión"</string>
<string name="loading" msgid="2600808404156989255">"Cargando conversaciones..."</string>
<string name="retry" msgid="4515885444824418022">"Reintentar"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8c1e52d..ee83b69 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Kaustad"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Ühendus puudub"</string>
<string name="loading" msgid="2600808404156989255">"Vestluse laadimine …"</string>
<string name="retry" msgid="4515885444824418022">"Proovi uuesti"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ec7d273..7bfff82 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"پوشهها"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"اتصالی موجود نیست"</string>
<string name="loading" msgid="2600808404156989255">"در حال بارگیری مکالمات…"</string>
<string name="retry" msgid="4515885444824418022">"سعی مجدد"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 10d28e4..adb3073 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Kansiot"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Ei yhteyttä"</string>
<string name="loading" msgid="2600808404156989255">"Ladataan keskusteluja"</string>
<string name="retry" msgid="4515885444824418022">"Yritä uudelleen"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c50fc6b..b2a2822 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Dossiers"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Aucune connexion"</string>
<string name="loading" msgid="2600808404156989255">"Chargement des conversations…"</string>
<string name="retry" msgid="4515885444824418022">"Réessayer"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0cccb6b..f512a60 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"फ़ोल्डर"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"कोई कनेक्शन नहीं"</string>
<string name="loading" msgid="2600808404156989255">"बातचीत लोड हो रही हैं…"</string>
<string name="retry" msgid="4515885444824418022">"पुन: प्रयास करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f2324bf..8b526e6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mape"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Nema veze"</string>
<string name="loading" msgid="2600808404156989255">"Učit. razgovora..."</string>
<string name="retry" msgid="4515885444824418022">"Pokušajte ponovo"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 584fce4..c4e1a66 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mappák"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Nincs kapcsolat"</string>
<string name="loading" msgid="2600808404156989255">"Továbbiak betöltése"</string>
<string name="retry" msgid="4515885444824418022">"Újra"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 588d5ff..122044c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Folder"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Tidak ada sambungan"</string>
<string name="loading" msgid="2600808404156989255">"Memuat percakapan..."</string>
<string name="retry" msgid="4515885444824418022">"Coba lagi"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1cca8bc..b4f8485 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Cartelle"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Nessuna connessione"</string>
<string name="loading" msgid="2600808404156989255">"Caricamento conversazioni…"</string>
<string name="retry" msgid="4515885444824418022">"Riprova"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 7ea13bf..cec74b5 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"תיקיות"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"אין חיבור"</string>
<string name="loading" msgid="2600808404156989255">"טוען שיחות…"</string>
<string name="retry" msgid="4515885444824418022">"נסה שוב"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 385a012..2c9b625 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"フォルダ"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"接続なし"</string>
<string name="loading" msgid="2600808404156989255">"スレッド読み込み中…"</string>
<string name="retry" msgid="4515885444824418022">"再試行"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7de3ebe..b3009a5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"폴더"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"연결되지 않음"</string>
<string name="loading" msgid="2600808404156989255">"대화 로드 중..."</string>
<string name="retry" msgid="4515885444824418022">"다시 시도"</string>
diff --git a/res/values-land/arrays.xml b/res/values-land/arrays.xml
index 2c015e4..ee7a5ad 100644
--- a/res/values-land/arrays.xml
+++ b/res/values-land/arrays.xml
@@ -16,10 +16,6 @@
limitations under the License.
-->
<resources>
- <integer-array name="conversation_heights_without_attachment_previews">
- <item>64</item>
- <item>70</item>
- </integer-array>
<integer-array name="senders_with_attachment_lengths">
<item>40</item>
<item>40</item>
diff --git a/res/values-land/dimen.xml b/res/values-land/dimen.xml
index 0dc5d8b..52327c0 100644
--- a/res/values-land/dimen.xml
+++ b/res/values-land/dimen.xml
@@ -17,5 +17,4 @@
-->
<resources>
<dimen name="compose_scrollview_width">800dp</dimen>
- <dimen name="subject_width">604dip</dimen>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d75d0da..3103d8e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Aplankai"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Nėra ryšio"</string>
<string name="loading" msgid="2600808404156989255">"Įkeliami pokalbiai…"</string>
<string name="retry" msgid="4515885444824418022">"Bandyti dar kartą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 639b961..f633ea8 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mapes"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Nav savienojuma"</string>
<string name="loading" msgid="2600808404156989255">"Notiek sarunu ielāde"</string>
<string name="retry" msgid="4515885444824418022">"Mēģināt vēlreiz"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6e2cf96..fee32b2 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Folder"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Tiada sambungan"</string>
<string name="loading" msgid="2600808404156989255">"Memuatkan perbualan..."</string>
<string name="retry" msgid="4515885444824418022">"Cuba semula"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7b6d228..bbddb16 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mapper"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Ingen nettilkobling"</string>
<string name="loading" msgid="2600808404156989255">"Laster inn samtaler …"</string>
<string name="retry" msgid="4515885444824418022">"Prøv på nytt"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 90c7937..3a15492 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -313,7 +313,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mappen"</string>
- <string name="toggle_drawer" msgid="4937513687658162188">"Lade in-/uitschakelen"</string>
<string name="network_error" msgid="2125579009654728299">"Geen verbinding"</string>
<string name="loading" msgid="2600808404156989255">"Conversaties laden..."</string>
<string name="retry" msgid="4515885444824418022">"Opnieuw proberen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0bda4fc..66d6e8a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -314,8 +314,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Foldery"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Brak połączenia"</string>
<string name="loading" msgid="2600808404156989255">"Ładowanie wątków…"</string>
<string name="retry" msgid="4515885444824418022">"Ponów próbę"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 72f8685..4a50c3f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Pastas"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Sem ligação"</string>
<string name="loading" msgid="2600808404156989255">"A carregar conver..."</string>
<string name="retry" msgid="4515885444824418022">"Tentar novamente"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 07e40b8..088a313 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Pastas"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Sem conexão"</string>
<string name="loading" msgid="2600808404156989255">"Carreg. conversas…"</string>
<string name="retry" msgid="4515885444824418022">"Tentar novamente"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 294233c..cd19597 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -479,8 +479,6 @@
<skip />
<!-- no translation found for folders (3359679829905256429) -->
<skip />
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<!-- no translation found for network_error (2125579009654728299) -->
<skip />
<!-- no translation found for loading (2600808404156989255) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 9305857..7478a04 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Dosare"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Nicio conexiune"</string>
<string name="loading" msgid="2600808404156989255">"Convers. se încarcă…"</string>
<string name="retry" msgid="4515885444824418022">"Reîncercaţi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f39400b..9a86b83 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Папки"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Нет подключения"</string>
<string name="loading" msgid="2600808404156989255">"Загрузка…"</string>
<string name="retry" msgid="4515885444824418022">"Повтор"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index debe5e6..f8ea2ca 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Priečinky"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Bez pripojenia"</string>
<string name="loading" msgid="2600808404156989255">"Prebieha načítavanie konverzácií..."</string>
<string name="retry" msgid="4515885444824418022">"Skúsiť znovu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ac537b8..930e9a7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mape"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Ni povezave"</string>
<string name="loading" msgid="2600808404156989255">"Nalaganje pogovorov ..."</string>
<string name="retry" msgid="4515885444824418022">"Poskusi znova"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 97c9073..53daca1 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Директоријуми"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Веза није успостављена"</string>
<string name="loading" msgid="2600808404156989255">"Учитавање преписки..."</string>
<string name="retry" msgid="4515885444824418022">"Покушај поново"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 53eee64..1192a04 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mappar"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Ingen anslutning"</string>
<string name="loading" msgid="2600808404156989255">"Konversationer hämtas …"</string>
<string name="retry" msgid="4515885444824418022">"Försök igen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3eed6e0..a4ee6e7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Folda"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Hakuna muunganisho"</string>
<string name="loading" msgid="2600808404156989255">"Inapakia mazungumzo..."</string>
<string name="retry" msgid="4515885444824418022">"Jaribu tena"</string>
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 8c8606d..9f486ba 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -16,13 +16,7 @@
limitations under the License.
-->
<resources>
- <dimen name="senders_font_size">18sp</dimen>
<dimen name="account_dropdown_dropdownwidth">496dip</dimen>
- <dimen name="wide_senders_margin_top">26dp</dimen>
- <dimen name="attachment_margin_top">8dp</dimen>
- <dimen name="max_total_folder_width_wide">120dip</dimen>
- <dimen name="wide_subject_margin_right">16dip</dimen>
- <dimen name="subject_width">238dip</dimen>
<dimen name="conversation_view_margin_side">32dp</dimen>
<dimen name="conversation_header_side_padding">0dip</dimen>
<dimen name="conversation_header_vertical_padding">12dip</dimen>
@@ -48,6 +42,4 @@
<dimen name="compose_area_right_padding">80dip</dimen>
<dimen name="search_view_width">400dip</dimen>
<dimen name="spinner_frame_width">170dp</dimen>
- <dimen name="folders_top_margin">12sp</dimen>
- <dimen name="star_top_margin">0sp</dimen>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 9cea97f..b214843 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -19,26 +19,6 @@
<style name="AccountSwitchSpinnerItem" parent="@style/PlainSpinnerDropdown">
<item name="android:layout_width">match_parent</item>
</style>
- <style name="PersonalIndicatorStyle">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_marginLeft">8dip</item>
- <item name="android:layout_marginTop">4sp</item>
- </style>
-
- <style name="CheckmarkStyle">
- <item name="android:layout_marginTop">-6sp</item>
- <item name="android:layout_marginLeft">8dip</item>
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- </style>
-
- <style name="StarStyle">
- <item name="android:layout_marginRight">12dip</item>
- <item name="android:layout_marginTop">-6sp</item>
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- </style>
<style name="ConversationSubjectStyle">
<item name="android:textSize">18sp</item>
@@ -67,14 +47,4 @@
</style>
<style name="ShortcutWidgetTheme" parent="@android:style/Theme.Holo.Dialog.MinWidth"/>
-
- <style name="SendersStyleImages" parent="@style/SendersStyle">
- <item name="android:layout_marginLeft">0dip</item>
- <item name="android:layout_marginTop">8sp</item>
- </style>
-
- <style name="PersonalIndicatorStyleImages" parent="@style/PersonalIndicatorStyle">
- <item name="android:layout_marginLeft">0dip</item>
- <item name="android:layout_marginTop">3sp</item>
- </style>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 88fce55..51f8115 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"โฟลเดอร์"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"ไม่มีการเชื่อมต่อ"</string>
<string name="loading" msgid="2600808404156989255">"กำลังโหลดการสนทนา…"</string>
<string name="retry" msgid="4515885444824418022">"ลองอีกครั้ง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a70733f..d4caf01 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Mga Folder"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Walang koneksyon"</string>
<string name="loading" msgid="2600808404156989255">"Nilo-load pag-uusap…"</string>
<string name="retry" msgid="4515885444824418022">"Subukang Muli"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 70e92ed..543be44 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Klasörler"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Bağlantı yok"</string>
<string name="loading" msgid="2600808404156989255">"İleti dizileri yükleniyor…"</string>
<string name="retry" msgid="4515885444824418022">"Yeniden dene"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 9034a7a..371373b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Папки"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Немає з’єднання"</string>
<string name="loading" msgid="2600808404156989255">"Завантаження бесід…"</string>
<string name="retry" msgid="4515885444824418022">"Повторити спробу"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f5a19a0..671017b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Thư mục"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Không có kết nối"</string>
<string name="loading" msgid="2600808404156989255">"Đang tải cuộc hội thoại..."</string>
<string name="retry" msgid="4515885444824418022">"Thử lại"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 093319f..3ed55a2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"文件夹"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"无连接"</string>
<string name="loading" msgid="2600808404156989255">"正在加载会话..."</string>
<string name="retry" msgid="4515885444824418022">"重试"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 86e6ef9..7eb28f3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"資料夾"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"沒有網路連線"</string>
<string name="loading" msgid="2600808404156989255">"正在載入會話群組…"</string>
<string name="retry" msgid="4515885444824418022">"重試"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2f19f54..1332050 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -316,8 +316,6 @@
<!-- no translation found for search_results_loaded (7840075360438913721) -->
<skip />
<string name="folders" msgid="3359679829905256429">"Amafolda"</string>
- <!-- no translation found for toggle_drawer (4937513687658162188) -->
- <skip />
<string name="network_error" msgid="2125579009654728299">"Akukho ukuxhumana"</string>
<string name="loading" msgid="2600808404156989255">"Ilayisha izingxoxo..."</string>
<string name="retry" msgid="4515885444824418022">"Zama kabusha"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d1cf8c2..f1bc004 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -16,10 +16,6 @@
limitations under the License.
-->
<resources>
- <integer-array name="conversation_heights_without_attachment_previews">
- <item>64</item>
- <item>72</item>
- </integer-array>
<integer-array name="senders_with_attachment_lengths">
<item>25</item>
<item>25</item>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 35b5a9c..22149ec 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -18,34 +18,16 @@
<resources>
<dimen name="account_dropdown_item_height">48dip</dimen>
- <dimen name="wide_senders_font_size">16sp</dimen>
- <dimen name="wide_subject_font_size">16sp</dimen>
<dimen name="senders_font_size">18sp</dimen>
<dimen name="subject_font_size">14sp</dimen>
<dimen name="folders_text_bottom_padding">4dip</dimen>
- <dimen name="folders_top_margin">10sp</dimen>
- <dimen name="star_top_margin">10sp</dimen>
- <dimen name="attachment_margin_top">6sp</dimen>
<dimen name="attachment_tile_min_size">120dp</dimen>
<dimen name="attachment_tile_max_size">164dp</dimen>
- <dimen name="folders_top_margin_wide">24sp</dimen>
- <dimen name="folders_min_height">18dp</dimen>
<dimen name="date_font_size">12sp</dimen>
<dimen name="account_dropdown_dropdownwidth">274dip</dimen>
<dimen name="compose_scrollview_width">700dp</dimen>
- <dimen name="total_conversationbar_width">150dip</dimen>
- <dimen name="max_total_folder_width">64dip</dimen>
- <dimen name="max_total_folder_width_wide">64dip</dimen>
<dimen name="color_block_width">32dip</dimen>
<dimen name="color_block_height">6dip</dimen>
- <dimen name="subject_width">204dip</dimen>
- <dimen name="folders_font_size">12sp</dimen>
- <dimen name="wide_senders_margin_top">0sp</dimen>
- <dimen name="wide_attachment_margin_top">2sp</dimen>
- <dimen name="wide_subject_margin_right">0dip</dimen>
- <dimen name="wide_date_margin_top">3dp</dimen>
- <dimen name="date_background_height">17sp</dimen>
- <dimen name="date_background_padding_left">4dip</dimen>
<dimen name="touch_slop">32dip</dimen>
<dimen name="move_slop">4dip</dimen>
<dimen name="standard_scaled_dimen">100sp</dimen>
@@ -99,8 +81,6 @@
<dimen name="widget_margin_left">0dip</dimen>
<dimen name="widget_margin_right">0dip</dimen>
<dimen name="widget_margin_bottom">0dip</dimen>
- <dimen name="conversation_item_height">72sp</dimen>
- <dimen name="conversation_item_height_wide">64sp</dimen>
<dimen name="search_view_width">400dip</dimen>
<dimen name="titlebar_height">48dip</dimen>
<dimen name="titlebar_icon_size">40dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9bc058d..6b61b5f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -653,8 +653,6 @@
<!-- Show in the actionbar -->
<string name="folders">Folders</string>
- <!-- Show in the actionbar: Corresponds to either sliding in or sliding out the drawer -->
- <string name="toggle_drawer">Toggle drawer</string>
<!-- Shown in conversation list footer when application cannot make a connection [CHAR LIMIT=20]-->
<string name="network_error">No connection</string>
@@ -854,9 +852,6 @@
<!-- Settings screen, what to display for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
<string name="silent_ringtone">Silent</string>
- <!-- Label list screen, banner for number of unseen messages [CHAR LIMIT=15] -->
- <string name="inbox_unseen_banner"><xliff:g id="number" example="7">%d</xliff:g> NEW</string>
-
<!-- Settings screen, preference for configuring preferred ActionBar items [CHAR LIMIT=50] -->
<string name="preference_preferred_actionbar_items">Preferred ActionBar items</string>
<!-- Dialog title for the preferred ActionBar items dialog [CHAR LIMIT=150] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4d5e9d9..1be4391 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -204,80 +204,11 @@
</style>
<!-- Browse list item styles -->
- <style name="PersonalIndicatorStyle">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_marginLeft">8dip</item>
- <item name="android:layout_marginTop">11sp</item>
- <item name="android:src">@drawable/ic_email_caret_single</item>
- </style>
-
- <style name="PersonalIndicatorStyleImages" parent="@style/PersonalIndicatorStyle">
- <item name="android:layout_marginLeft">0dip</item>
- <item name="android:layout_marginTop">11sp</item>
- </style>
-
- <style name="SendersStyle">
- <item name="android:layout_marginLeft">8dip</item>
- <item name="android:layout_marginTop">10sp</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">@dimen/senders_font_size</item>
- <item name="android:lines">1</item>
- <item name="android:text">@string/long_string</item>
- </style>
-
- <style name="SendersStyleImages" parent="@style/SendersStyle">
- <item name="android:layout_marginLeft">4dip</item>
- <item name="android:layout_marginTop">10sp</item>
- </style>
-
- <style name="DateStyle">
- <item name="android:layout_width">0dip</item>
- <item name="android:layout_weight">1</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:text">@string/long_string</item>
- <item name="android:textSize">@dimen/date_font_size</item>
- <item name="android:lines">1</item>
- <item name="android:layout_marginRight">14dip</item>
- <item name="android:layout_marginTop">10sp</item>
- </style>
-
- <style name="DateStyleImages" parent="@style/DateStyle">
- </style>
-
- <style name="CheckmarkStyle">
- <item name="android:layout_marginTop">-5sp</item>
- <item name="android:layout_marginLeft">8dip</item>
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:src">@drawable/btn_check_on_normal_holo_light</item>
- </style>
-
<style name="ConversationListFade" parent="@android:style/Widget.Holo.Light.ListView">
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:divider">@android:color/transparent</item>
<item name="android:dividerHeight">0dip</item>
</style>
-
- <style name="StarStyle">
- <item name="android:layout_marginLeft">16dip</item>
- <item name="android:layout_marginRight">16dip</item>
- <item name="android:layout_marginTop">-4sp</item>
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:src">@drawable/btn_star_off_normal_email_holo_light</item>
- </style>
-
- <style name="SubjectStyle">
- <item name="android:layout_marginTop">-4sp</item>
- <item name="android:textColor">@color/subject_text_color</item>
- <item name="android:textSize">@dimen/subject_font_size</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:text">@string/long_string</item>
- <item name="android:lines">2</item>
- </style>
<!-- End browse list item styles -->
<!-- Undo bar styles -->
diff --git a/src/com/android/mail/adapter/DrawerItem.java b/src/com/android/mail/adapter/DrawerItem.java
index a2f13ab..b21efb7 100644
--- a/src/com/android/mail/adapter/DrawerItem.java
+++ b/src/com/android/mail/adapter/DrawerItem.java
@@ -268,8 +268,8 @@
// Folders are always enabled.
return true;
case VIEW_ACCOUNT:
- // Accounts are only enabled if they are not the current account.
- return !mIsCurrentAccount;
+ // Accounts are always enabled.
+ return true;
case VIEW_WAITING_FOR_SYNC:
// Waiting for sync cannot be tapped, so never enabled.
return false;
diff --git a/src/com/android/mail/browse/ConversationCursor.java b/src/com/android/mail/browse/ConversationCursor.java
index 1448d9e..d9dfd46 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java
@@ -1955,6 +1955,28 @@
return super.hashCode();
}
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder(super.toString());
+ sb.setLength(sb.length() - 1);
+ sb.append(" mDeferSync=");
+ sb.append(mDeferSync);
+ sb.append(" mRefreshRequired=");
+ sb.append(mRefreshRequired);
+ sb.append(" mRefreshReady=");
+ sb.append(mRefreshReady);
+ sb.append(" mRefreshTask=");
+ sb.append(mRefreshTask);
+ sb.append(" mPaused=");
+ sb.append(mPaused);
+ sb.append(" mDeletedCount=");
+ sb.append(mDeletedCount);
+ sb.append(" mUnderlying=");
+ sb.append(mUnderlyingCursor);
+ sb.append("}");
+ return sb.toString();
+ }
+
private void resetNotificationActions() {
final boolean changed = !mNotificationTempDeleted.isEmpty();
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index c384f12..f145f54 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -65,9 +65,8 @@
import com.android.mail.photomanager.PhotoManager.PhotoIdentifier;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
-import com.android.mail.providers.UIProvider;
-import com.android.mail.providers.UIProvider.ConversationListIcon;
import com.android.mail.providers.UIProvider.ConversationColumns;
+import com.android.mail.providers.UIProvider.ConversationListIcon;
import com.android.mail.providers.UIProvider.FolderType;
import com.android.mail.ui.AnimatedAdapter;
import com.android.mail.ui.ControllableActivity;
@@ -297,13 +296,14 @@
// Draw the box.
sFoldersPaint.setColor(bgColor);
- sFoldersPaint.setStyle(isMuted ? Paint.Style.STROKE : Paint.Style.FILL_AND_STROKE);
+ sFoldersPaint.setStyle(Paint.Style.FILL);
canvas.drawRect(xStart, y, xStart + width - sFoldersLeftPadding,
y + height, sFoldersPaint);
// Draw the text.
final int padding = cellSize / 2;
sFoldersPaint.setColor(fgColor);
+ sFoldersPaint.setStyle(Paint.Style.FILL);
if (labelTooLong) {
final int rightBorder = xStart + width - sFoldersLeftPadding - padding;
final Shader shader = new LinearGradient(rightBorder - padding, y, rightBorder,
diff --git a/src/com/android/mail/browse/ConversationItemViewCoordinates.java b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
index 994472c..72340dc 100644
--- a/src/com/android/mail/browse/ConversationItemViewCoordinates.java
+++ b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
@@ -61,12 +61,6 @@
static final int ATTACHMENT_PREVIEW_TALL = 1;
static final int ATTACHMENT_PREVIEW_SHORT = 2;
- // Static threshold.
- private static int TOTAL_FOLDER_WIDTH = -1;
- private static int TOTAL_FOLDER_WIDTH_WIDE = -1;
- @Deprecated
- private static int sConversationHeights[];
-
// For combined views
private static int COLOR_BLOCK_WIDTH = -1;
private static int COLOR_BLOCK_HEIGHT = -1;
@@ -235,8 +229,8 @@
private ConversationItemViewCoordinates(Context context, Config config) {
final ViewGroup view = (ViewGroup) LayoutInflater.from(context).inflate(
- config.getMode() == WIDE_MODE ? R.layout.conversation_item_view_wide2 :
- R.layout.conversation_item_view_normal2, null);
+ config.getMode() == WIDE_MODE ? R.layout.conversation_item_view_wide :
+ R.layout.conversation_item_view_normal, null);
final TextView folders = (TextView) view.findViewById(R.id.folders);
folders.setVisibility(config.areFoldersVisible() ? View.VISIBLE : View.GONE);
@@ -446,30 +440,6 @@
}
/**
- * Returns the height of the view in this mode.
- */
- @Deprecated
- public static int getHeight(Context context, int mode, int attachmentPreviewMode) {
- if (sConversationHeights == null) {
- refreshConversationDimens(context);
- }
-
- // Base height
- int result = sConversationHeights[mode];
-
- // Attachment previews margin top
- if (attachmentPreviewMode != ATTACHMENT_PREVIEW_NONE) {
- result += sAttachmentPreviewsMarginTops[mode];
- }
-
- // Attachment previews height
- result += getAttachmentPreviewsHeight(
- context, attachmentPreviewMode);
-
- return result;
- }
-
- /**
* Refreshes the conversation heights array.
*/
@Deprecated
@@ -480,10 +450,6 @@
Resources res = context.getResources();
float density = res.getDisplayMetrics().scaledDensity;
- // Height without attachment previews
- sConversationHeights = getDensityDependentArray(
- res.getIntArray(R.array.conversation_heights_without_attachment_previews), density);
-
// Attachment previews height
sAttachmentPreviewsHeights = new int[ATTACHMENT_PREVIEW_MODE_COUNT];
sAttachmentPreviewsHeights[ATTACHMENT_PREVIEW_TALL] = 0;
@@ -501,7 +467,7 @@
}
public static int getAttachmentPreviewsHeight(Context context, int attachmentPreviewMode) {
- if (sConversationHeights == null) {
+ if (sAttachmentPreviewsHeights == null) {
refreshConversationDimens(context);
}
return sAttachmentPreviewsHeights[attachmentPreviewMode];
@@ -574,27 +540,6 @@
return COLOR_BLOCK_HEIGHT;
}
- /**
- * Returns the width available to draw folders in this mode.
- */
- @Deprecated
- public static int getFoldersWidth(Context context, int mode) {
- Resources res = context.getResources();
- if (TOTAL_FOLDER_WIDTH <= 0) {
- TOTAL_FOLDER_WIDTH = res.getDimensionPixelSize(R.dimen.max_total_folder_width);
- TOTAL_FOLDER_WIDTH_WIDE = res.getDimensionPixelSize(
- R.dimen.max_total_folder_width_wide);
- }
- switch (mode) {
- case WIDE_MODE:
- return TOTAL_FOLDER_WIDTH_WIDE;
- case NORMAL_MODE:
- return TOTAL_FOLDER_WIDTH;
- default:
- throw new IllegalArgumentException("Unknown conversation header view mode " + mode);
- }
- }
-
public static boolean displaySendersInline(int mode) {
switch (mode) {
case WIDE_MODE:
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index e0f78ea..6cf271f 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -294,8 +294,9 @@
public static final int LAST_LOADER_ID = 100;
/**
* Guaranteed to be the last loader ID used by the Fragment. Loaders are owned by Activity or
- * fragments, and within an activity, loader IDs need to be unique. Currently, only one special
- * view in Gmail uses {@link ConversationListFragment}'s LoaderManager.
+ * fragments, and within an activity, loader IDs need to be unique. Currently,
+ * {@link SectionedInboxTeaserView} is the only class that uses the
+ * {@link ConversationListFragment}'s LoaderManager.
*/
public static final int LAST_FRAGMENT_LOADER_ID = 1000;
@@ -519,7 +520,14 @@
LogUtils.d(LOG_TAG, "AAC.changeAccount(%s)", account);
// Is the account or account settings different from the existing account?
final boolean firstLoad = mAccount == null;
+ final boolean switchToDefaultInbox = !firstLoad && account.uri.equals(mAccount.uri);
final boolean accountChanged = firstLoad || !account.uri.equals(mAccount.uri);
+
+ // if the active account has been clicked in the drawer, go to default inbox
+ if (switchToDefaultInbox) {
+ loadAccountInbox();
+ return;
+ }
// If nothing has changed, return early without wasting any more time.
if (!accountChanged && !account.settingsDiffer(mAccount)) {
return;
diff --git a/src/com/android/mail/ui/AbstractConversationViewFragment.java b/src/com/android/mail/ui/AbstractConversationViewFragment.java
index 1eff9e5..a81a2ca 100644
--- a/src/com/android/mail/ui/AbstractConversationViewFragment.java
+++ b/src/com/android/mail/ui/AbstractConversationViewFragment.java
@@ -576,7 +576,7 @@
// or if unread messages still exist in the message list cursor
// we don't want to keep marking viewed on rotation or restore
// but we do want future re-renders to mark read (e.g. "New message from X" case)
- MessageCursor cursor = getMessageCursor();
+ final MessageCursor cursor = getMessageCursor();
if (!mConversation.isViewed() || (cursor != null && !cursor.isConversationRead())) {
// Mark the conversation viewed and read.
activity.getConversationUpdater()
@@ -584,7 +584,7 @@
// and update the Message objects in the cursor so the next time a cursor update
// happens with these messages marked read, we know to ignore it
- if (cursor != null) {
+ if (cursor != null && !cursor.isClosed()) {
cursor.markMessagesRead();
}
}
diff --git a/src/com/android/mail/ui/FolderItemView.java b/src/com/android/mail/ui/FolderItemView.java
index 45007ea..0759c30 100644
--- a/src/com/android/mail/ui/FolderItemView.java
+++ b/src/com/android/mail/ui/FolderItemView.java
@@ -177,8 +177,7 @@
mUnseenCountTextView.setVisibility(count > 0 ? View.VISIBLE : View.GONE);
if (count > 0) {
mUnseenCountTextView.setBackgroundColor(color);
- mUnseenCountTextView.setText(
- getContext().getString(R.string.inbox_unseen_banner, count));
+ mUnseenCountTextView.setText(Utils.getUnreadCountString(getContext(), count));
}
}
diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 9c22969..e1c9d94 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -262,7 +262,8 @@
mCurrentFolderForUnreadCheck = currentFolder;
}
- // Initialize adapter for folder/heirarchical list
+ // Initialize adapter for folder/heirarchical list. Note this relies on
+ // mActivity being initialized.
final Folder selectedFolder;
if (mParentFolder != null) {
mCursorAdapter = new HierarchicalFolderListAdapter(null, mParentFolder);
@@ -330,7 +331,6 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedState) {
- setInstanceFromBundle(getArguments());
final View rootView = inflater.inflate(R.layout.folder_list, null);
mListView = (ListView) rootView.findViewById(android.R.id.list);
mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index c865ceb..44f3281 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -17,7 +17,6 @@
package com.android.mail.ui;
-import android.app.ActionBar;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
@@ -26,8 +25,10 @@
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.widget.DrawerLayout;
+import android.view.View;
import android.view.Gravity;
import android.view.ViewGroup;
+import android.widget.ImageView;
import com.android.mail.ConversationListContext;
import com.android.mail.R;
@@ -73,7 +74,9 @@
private DrawerLayout mDrawerContainer;
private ViewGroup mDrawerPullout;
- /** Burger icon */
+ /** Icon changing hack - Maintain pointer to the Up view/drawable and the burger drawable */
+ private ImageView mUp;
+ private Drawable mUpDrawable;
private Drawable mBurgerDrawable;
public OnePaneController(MailActivity activity, ViewMode viewMode) {
@@ -158,28 +161,67 @@
mDrawerContainer.setScrimColor(
mContext.getResources().getColor(R.color.drawer_background_dim));
mDrawerPullout = (ViewGroup) mDrawerContainer.findViewById(R.id.drawer_pullout);
+ configureUpDrawable();
mDrawerContainer.setDrawerShadow(
mContext.getResources().getDrawable(R.drawable.drawer_shadow), Gravity.LEFT);
- // Store the burger drawable for switching with the up arrow later
- mBurgerDrawable = mContext.getResources().getDrawable(R.drawable.ic_drawer_glyph);
// The parent class sets the correct viewmode and starts the application off.
return super.onCreate(savedInstanceState);
}
/**
+ * Hack for configuring and saving pointers to the up arrow when required to change from Up to
+ * Burger and vice-versa.
+ *
+ * NOTE: The hack takes in account that the OEM has not modified the home button's children.
+ * If modified, there's a risk of modifying something that shouldn't be.
+ *
+ * TODO(shahrk): Make icon changing safer through framework or remove it?
+ */
+ private void configureUpDrawable() {
+ final View home = mActivity.findViewById(android.R.id.home);
+ if (home == null) {
+ LogUtils.w(LOG_TAG,
+ "OnePaneController.configureUpDrawable(): Action bar home was not discovered");
+ // Action bar doesn't have a known configuration, an OEM modified home completely
+ return;
+ }
+
+ final ViewGroup parent = (ViewGroup) home.getParent();
+ final int childCount = parent.getChildCount();
+ if (childCount != 2) {
+ // No idea which child will be the right ImageView for 'up', an OEM has modified home
+ LogUtils.w(LOG_TAG, "OnePaneController.configureUpDrawable(): "
+ + "Action bar has incorrect number of children: %d expected 2", childCount);
+ return;
+ }
+
+ final View first = parent.getChildAt(0);
+ final View second = parent.getChildAt(1);
+ // Get the view that's NOT android.R.id.home
+ final View up = first.getId() == android.R.id.home ? second : first;
+ if (up instanceof ImageView) {
+ // We've most likely discovered the correct ImageView for the up arrow. Save the
+ // drawable/reference to view and also load the burger drawable for drawer indication.
+ mUp = (ImageView) up;
+ mUpDrawable = mUp.getDrawable();
+ mBurgerDrawable = mContext.getResources().getDrawable(R.drawable.ic_drawer_glyph);
+ } else {
+ LogUtils.w(LOG_TAG,
+ "OnePaneController.configureUpDrawable(): Up arrow was not of type ImageView");
+ }
+ }
+
+ /**
* Changes the up graphic (on left of gmail icon) to either be 'Up' or the 'Burger'.
*
* @param changeToBurger true if icon should be 'burger', false if icon should be 'up'
*/
private void changeUpArrow(final boolean changeToBurger) {
- final ActionBar actionBar = mActivity.getActionBar();
- if(actionBar != null) {
+ if(mUp != null) {
if (changeToBurger) {
- actionBar.setHomeAsUpIndicator(mBurgerDrawable);
- actionBar.setHomeActionContentDescription(R.string.toggle_drawer);
+ mUp.setImageDrawable(mBurgerDrawable);
} else {
- actionBar.setHomeAsUpIndicator(null);
- actionBar.setHomeActionContentDescription(null);
+ mUp.setImageDrawable(mUpDrawable);
}
}
}
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 764bbe4..dddeb63 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -263,6 +263,7 @@
* Get all notifications for all accounts and cancel them.
**/
public static void cancelAllNotifications(Context context) {
+ LogUtils.d(LOG_TAG, "NotificationUtils: cancelAllNotifications - cancelling all");
NotificationManager nm = (NotificationManager) context.getSystemService(
Context.NOTIFICATION_SERVICE);
nm.cancelAll();
@@ -283,6 +284,7 @@
**/
public static void resendNotifications(Context context, final boolean cancelExisting) {
if (cancelExisting) {
+ LogUtils.d(LOG_TAG, "NotificationUtils: resendNotifications - cancelling all");
NotificationManager nm =
(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
nm.cancelAll();
@@ -351,6 +353,9 @@
for (NotificationKey notification : notificationsToCancel) {
final Folder folder = notification.folder;
final int notificationId = getNotificationId(notification.account.name, folder);
+ LogUtils.d(LOG_TAG,
+ "NotificationUtils: validateAccountNotifications - cancelling %s / %s",
+ notification.account.name, folder.persistentId);
nm.cancel(notificationId);
notificationMap.remove(notification);
NotificationActionUtils.sUndoNotifications.remove(notificationId);
@@ -374,6 +379,9 @@
final NotificationMap notificationMap = getNotificationMap(context);
final NotificationKey key = new NotificationKey(account, folder);
if (unreadCount == 0) {
+ LogUtils.d(LOG_TAG,
+ "NotificationUtils: setNewEmailIndicator - cancelling %s / %s",
+ account.name, folder.persistentId);
notificationMap.remove(key);
((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE))
.cancel(notificationId);
@@ -455,6 +463,9 @@
final int notificationId = getNotificationId(account.name, folder);
if (unseenCount == 0) {
+ LogUtils.d(LOG_TAG,
+ "NotificationUtils: validateNotifications - cancelling %s / %s",
+ account.name, folder.persistentId);
nm.cancel(notificationId);
return;
}