diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/conversation_long_press_to_select_tip_view.xml | 1 | ||||
-rw-r--r-- | res/layout/conversation_outbox_tip_view.xml | 1 | ||||
-rw-r--r-- | res/layout/conversation_photo_teaser_view.xml | 1 | ||||
-rw-r--r-- | res/layout/conversation_sync_disabled_tip_view.xml | 1 | ||||
-rw-r--r-- | res/layout/folder_teaser_item.xml | 90 | ||||
-rw-r--r-- | res/layout/nested_folder_teaser_view.xml | 89 | ||||
-rw-r--r-- | res/layout/teaser_right_edge.xml | 24 |
7 files changed, 85 insertions, 122 deletions
diff --git a/res/layout/conversation_long_press_to_select_tip_view.xml b/res/layout/conversation_long_press_to_select_tip_view.xml index 59b17ff12..dc0f3d077 100644 --- a/res/layout/conversation_long_press_to_select_tip_view.xml +++ b/res/layout/conversation_long_press_to_select_tip_view.xml @@ -48,7 +48,6 @@ android:src="@drawable/ic_cancel_holo_light" style="@style/DismissButtonStyle" /> - <include layout="@layout/teaser_right_edge" /> </LinearLayout> </com.android.mail.ui.ConversationLongPressTipView> diff --git a/res/layout/conversation_outbox_tip_view.xml b/res/layout/conversation_outbox_tip_view.xml index 6277c300f..e10f9232f 100644 --- a/res/layout/conversation_outbox_tip_view.xml +++ b/res/layout/conversation_outbox_tip_view.xml @@ -47,7 +47,6 @@ android:src="@drawable/ic_cancel_holo_light" style="@style/DismissButtonStyle" /> - <include layout="@layout/teaser_right_edge" /> </LinearLayout> </com.android.mail.ui.ConversationsInOutboxTipView> diff --git a/res/layout/conversation_photo_teaser_view.xml b/res/layout/conversation_photo_teaser_view.xml index 6aac4d8a4..f66c16976 100644 --- a/res/layout/conversation_photo_teaser_view.xml +++ b/res/layout/conversation_photo_teaser_view.xml @@ -57,7 +57,6 @@ android:src="@drawable/ic_cancel_holo_light" style="@style/DismissButtonStyle" /> - <include layout="@layout/teaser_right_edge" /> </LinearLayout> </com.android.mail.ui.ConversationPhotoTeaserView> diff --git a/res/layout/conversation_sync_disabled_tip_view.xml b/res/layout/conversation_sync_disabled_tip_view.xml index 1ed63a739..8d96d70ce 100644 --- a/res/layout/conversation_sync_disabled_tip_view.xml +++ b/res/layout/conversation_sync_disabled_tip_view.xml @@ -61,7 +61,6 @@ android:src="@drawable/ic_cancel_holo_light" style="@style/DismissButtonStyle" /> - <include layout="@layout/teaser_right_edge" /> </LinearLayout> </com.android.mail.ui.ConversationSyncDisabledTipView> diff --git a/res/layout/folder_teaser_item.xml b/res/layout/folder_teaser_item.xml index 65bd68030..f949d5d08 100644 --- a/res/layout/folder_teaser_item.xml +++ b/res/layout/folder_teaser_item.xml @@ -15,61 +15,61 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="56dp" - android:background="@drawable/folder_teaser_item_background"> - - <ImageView - android:id="@+id/folder_imageView" - android:layout_width="24dp" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:duplicateParentState="true" - style="@style/FolderTeaserMarginStartStyle" /> + android:layout_height="wrap_content" + android:background="@drawable/folder_teaser_item_background" + android:orientation="vertical"> <LinearLayout - android:id="@+id/text_layout" - android:layout_width="0dip" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:duplicateParentState="true" - android:orientation="vertical" - style="@style/FolderTeaserLabelMarginStyle" > + android:minHeight="@dimen/folder_teaser_item_height" + style="@style/FolderTeaserMarginEndStyle"> - <TextView - android:id="@+id/folder_textView" - android:layout_width="wrap_content" + <ImageView + android:id="@+id/nested_folder_icon" + android:layout_width="@dimen/folder_teaser_start_margin" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:src="@drawable/ic_drawer_folder_24dp" /> + + <LinearLayout + android:id="@+id/text_layout" + android:layout_width="0dp" android:layout_height="wrap_content" - android:duplicateParentState="true" - android:includeFontPadding="false" - android:textColor="@color/folder_teaser_main_text" - android:textSize="16sp" - android:textStyle="bold" - android:singleLine="true" - android:ellipsize="end" /> + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:orientation="vertical"> + + <TextView + android:id="@+id/folder_textView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textSize="16sp" + android:textColor="@color/folder_teaser_main_text"/> + + <TextView + android:id="@+id/senders_textView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textSize="14sp" + android:textColor="@color/folder_teaser_sub_text" /> + + </LinearLayout> <TextView - android:id="@+id/senders_textView" + android:id="@+id/count_textView" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:duplicateParentState="true" - android:includeFontPadding="false" - android:fontFamily="sans-serif-light" - android:textColor="@color/folder_teaser_senders_text" - android:textSize="12sp" - android:singleLine="true" - android:ellipsize="end" /> + android:layout_height="match_parent" + style="@style/FolderTeaserCountTextStyle" /> </LinearLayout> - <TextView - android:id="@+id/count_textView" - android:layout_width="57sp" - android:layout_height="20sp" - android:layout_gravity="center_vertical" - android:gravity="center" - android:textColor="@color/folder_teaser_count_text" - android:textSize="14sp" - style="@style/FolderTeaserMarginEndStyle" /> + <View style="@style/ConversationListDividerStyleIndented" /> </LinearLayout> diff --git a/res/layout/nested_folder_teaser_view.xml b/res/layout/nested_folder_teaser_view.xml index 9e71f61c0..0f0e74745 100644 --- a/res/layout/nested_folder_teaser_view.xml +++ b/res/layout/nested_folder_teaser_view.xml @@ -15,65 +15,56 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.mail.ui.NestedFolderTeaserView xmlns:android="http://schemas.android.com/apk/res/android" + +<com.android.mail.ui.NestedFolderTeaserView + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:background="@drawable/conversation_item_background_selector" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/nested_folder_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> <LinearLayout - android:layout_width="0dp" + android:id="@+id/show_more_folders_row" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:background="@drawable/conversation_item_background_selector" - android:orientation="vertical" > + android:layout_gravity="center_vertical" + android:background="@drawable/folder_teaser_item_background" + android:minHeight="@dimen/folder_teaser_item_height" + style="@style/FolderTeaserMarginEndStyle"> - <LinearLayout - android:id="@+id/nested_folder_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:divider="?android:dividerHorizontal" - android:showDividers="middle|end" > - </LinearLayout> + <ImageView + android:id="@+id/show_more_folders_icon" + android:layout_width="@dimen/folder_teaser_start_margin" + android:layout_height="match_parent" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:scaleType="center" /> - <LinearLayout - android:id="@+id/show_more_folders_row" - android:background="@drawable/folder_teaser_item_background" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="12dp" - android:paddingTop="12dp" > + <TextView + android:id="@+id/show_more_folders_textView" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:ellipsize="end" + android:gravity="center_vertical" + android:singleLine="true" + android:textSize="16sp" + android:textColor="@color/folder_teaser_main_text" /> - <TextView - android:id="@+id/show_more_folders_textView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_weight="1" - android:duplicateParentState="true" - android:ellipsize="end" - android:includeFontPadding="false" - android:singleLine="true" - android:textColor="@color/teaser_main_text" - android:textSize="16sp" - android:textStyle="bold" /> + <TextView + android:id="@+id/show_more_folders_count_textView" + android:layout_width="wrap_content" + android:layout_height="match_parent" + style="@style/FolderTeaserCountTextStyle" /> - <TextView - android:id="@+id/show_more_folders_count_textView" - android:layout_width="wrap_content" - android:layout_height="24sp" - android:layout_marginLeft="12dp" - android:layout_marginRight="16dp" - android:gravity="center" - android:minWidth="@dimen/folder_teaser_count_textview_minwidth" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:textColor="@color/folder_teaser_count_text" - android:textSize="16sp" /> - </LinearLayout> </LinearLayout> - <include layout="@layout/teaser_right_edge" /> + <View style="@style/ConversationListDividerStyle" /> </com.android.mail.ui.NestedFolderTeaserView>
\ No newline at end of file diff --git a/res/layout/teaser_right_edge.xml b/res/layout/teaser_right_edge.xml deleted file mode 100644 index c3c0270d3..000000000 --- a/res/layout/teaser_right_edge.xml +++ /dev/null @@ -1,24 +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 is used to show the line on the right edge of a list item in tablet ui --> -<ImageView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/teaser_right_edge" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:src="@drawable/list_edge_tablet"/> |