diff options
author | Jin Cao <jinyan@google.com> | 2014-08-05 14:03:59 -0700 |
---|---|---|
committer | Jin Cao <jinyan@google.com> | 2014-08-08 17:57:43 -0700 |
commit | a7404589b03ac9dd0d07b3f7d0a1ec92ac9acb62 (patch) | |
tree | 0d8e9613760c7ffff1a6ca24b910671a231f38cb /res | |
parent | 094986e3c824d705909af10464954532c377adc3 (diff) | |
download | android_packages_apps_UnifiedEmail-a7404589b03ac9dd0d07b3f7d0a1ec92ac9acb62.tar.gz android_packages_apps_UnifiedEmail-a7404589b03ac9dd0d07b3f7d0a1ec92ac9acb62.tar.bz2 android_packages_apps_UnifiedEmail-a7404589b03ac9dd0d07b3f7d0a1ec92ac9acb62.zip |
[KBNav CV] basic support for CV keyboard nav
Support basic navigation via keyboard in CV.
b/16636060
Change-Id: I66dbcd8015d722244b57c4e24579d0d854d3ee74
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/conversation_footer.xml | 3 | ||||
-rw-r--r-- | res/layout/conversation_message_footer.xml | 3 | ||||
-rw-r--r-- | res/layout/conversation_message_header.xml | 35 | ||||
-rw-r--r-- | res/layout/conversation_message_upper_header.xml | 5 | ||||
-rw-r--r-- | res/layout/conversation_message_upper_header_actions.xml | 21 | ||||
-rw-r--r-- | res/layout/conversation_message_upper_header_text.xml | 7 | ||||
-rw-r--r-- | res/layout/conversation_view.xml | 12 | ||||
-rw-r--r-- | res/layout/conversation_view_header.xml | 3 | ||||
-rw-r--r-- | res/layout/super_collapsed_block.xml | 3 |
9 files changed, 61 insertions, 31 deletions
diff --git a/res/layout/conversation_footer.xml b/res/layout/conversation_footer.xml index c8eb691cc..edd270a87 100644 --- a/res/layout/conversation_footer.xml +++ b/res/layout/conversation_footer.xml @@ -33,18 +33,21 @@ <TextView android:id="@+id/reply_button" android:drawableTop="@drawable/ic_reply_24dp" + android:focusable="true" android:text="@string/reply" style="@style/ConversationFooterButtonStyle" /> <TextView android:id="@+id/reply_all_button" android:drawableTop="@drawable/ic_reply_all_24dp" + android:focusable="true" android:text="@string/reply_all" style="@style/ConversationFooterButtonStyle" /> <TextView android:id="@+id/forward_button" android:drawableTop="@drawable/ic_forward_24dp" + android:focusable="true" android:text="@string/forward" style="@style/ConversationFooterButtonStyle" /> diff --git a/res/layout/conversation_message_footer.xml b/res/layout/conversation_message_footer.xml index 367801ed5..e3667bd06 100644 --- a/res/layout/conversation_message_footer.xml +++ b/res/layout/conversation_message_footer.xml @@ -20,13 +20,14 @@ android:id="@+id/attachments" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical"> <TextView android:id="@+id/view_entire_message_prompt" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?android:attr/selectableItemBackground" + android:focusable="true" android:paddingTop="12dp" android:paddingBottom="12dp" android:text="@string/view_entire_message" diff --git a/res/layout/conversation_message_header.xml b/res/layout/conversation_message_header.xml index 7a8489179..0f9dce2d7 100644 --- a/res/layout/conversation_message_header.xml +++ b/res/layout/conversation_message_header.xml @@ -19,24 +19,27 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="visible" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="visible"> - <include android:id="@+id/message_header_border" layout="@layout/conversation_view_border" /> + <include layout="@layout/conversation_view_border" + android:id="@+id/message_header_border" /> <include layout="@layout/conversation_message_upper_header" - android:id="@+id/upper_header" /> - - <LinearLayout android:id="@+id/header_extra_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/message_header_background_color" - android:orientation="vertical" /> - - <View android:id="@+id/snap_header_bottom_border" - android:layout_width="match_parent" - android:layout_height="12dp" - android:background="@drawable/snap_header_gradient" - android:visibility="gone" /> + android:id="@+id/upper_header" /> + + <LinearLayout + android:id="@+id/header_extra_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/message_header_background_color" + android:orientation="vertical" /> + + <View + android:id="@+id/snap_header_bottom_border" + android:layout_width="match_parent" + android:layout_height="12dp" + android:background="@drawable/snap_header_gradient" + android:visibility="gone" /> </com.android.mail.browse.MessageHeaderView> diff --git a/res/layout/conversation_message_upper_header.xml b/res/layout/conversation_message_upper_header.xml index b8552df93..a64122a1b 100644 --- a/res/layout/conversation_message_upper_header.xml +++ b/res/layout/conversation_message_upper_header.xml @@ -18,8 +18,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/message_header_background_color" - android:duplicateParentState="true" > + android:addStatesFromChildren="true" + android:background="?android:attr/selectableItemBackground" + android:focusable="true"> <com.android.mail.browse.MessageHeaderContactBadge android:id="@+id/photo" diff --git a/res/layout/conversation_message_upper_header_actions.xml b/res/layout/conversation_message_upper_header_actions.xml index ab98ec3ec..69297ad47 100644 --- a/res/layout/conversation_message_upper_header_actions.xml +++ b/res/layout/conversation_message_upper_header_actions.xml @@ -16,25 +16,30 @@ limitations under the License. --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> + <ImageView android:id="@+id/edit_draft" - style="@style/MessageHeaderActionButtonStyle" - android:visibility="gone" + android:contentDescription="@string/resume_draft" android:src="@drawable/ic_edit_24dp" - android:contentDescription="@string/resume_draft" /> + android:visibility="gone" + style="@style/MessageHeaderActionButtonStyle" /> + <ImageView android:id="@+id/reply" - style="@style/MessageHeaderActionButtonStyle" + android:contentDescription="@string/reply" android:src="@drawable/ic_reply_24dp" - android:contentDescription="@string/reply" /> + style="@style/MessageHeaderActionButtonStyle" /> + <ImageView android:id="@+id/reply_all" - style="@style/MessageHeaderActionButtonStyle" + android:contentDescription="@string/reply_all" android:src="@drawable/ic_reply_all_24dp" - android:contentDescription="@string/reply_all" /> + style="@style/MessageHeaderActionButtonStyle" /> + <ImageView android:id="@+id/overflow" - android:layout_height="@dimen/message_header_action_button_height" android:layout_width="@dimen/message_header_action_button_width" + android:layout_height="@dimen/message_header_action_button_height" style="@style/OverflowButtonStyle" /> + </merge> diff --git a/res/layout/conversation_message_upper_header_text.xml b/res/layout/conversation_message_upper_header_text.xml index eedad010a..e311e644a 100644 --- a/res/layout/conversation_message_upper_header_text.xml +++ b/res/layout/conversation_message_upper_header_text.xml @@ -35,6 +35,7 @@ android:visibility="gone" android:lines="1" style="@style/MessageHeaderUpperDateStyle" /> + <ImageView android:id="@+id/attachment" android:layout_width="wrap_content" @@ -44,6 +45,7 @@ android:layout_toLeftOf="@id/upper_date" android:src="@drawable/ic_attach_file_20dp" style="@style/AttachmentIconStyle" /> + <TextView android:id="@id/sender_name" android:layout_width="wrap_content" @@ -51,12 +53,14 @@ android:layout_toStartOf="@id/attachment" android:layout_toLeftOf="@id/attachment" style="@style/MessageSenderNameStyle" /> + <TextView android:id="@+id/recipient_summary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/sender_name" style="@style/MessageHeaderSubtitleStyle" /> + <TextView android:id="@+id/send_date" android:layout_width="wrap_content" @@ -65,6 +69,7 @@ android:background="?android:attr/selectableItemBackground" android:paddingBottom="@dimen/message_header_margin_bottom" style="@style/MessageHeaderSubtitleStyle" /> + <TextView android:id="@+id/hide_details" android:layout_width="wrap_content" @@ -76,6 +81,7 @@ android:textColor="@color/conversation_view_text_color_link_blue" android:visibility="gone" style="@style/MessageHeaderSubtitleStyle" /> + <TextView android:id="@+id/email_snippet" android:layout_width="wrap_content" @@ -83,4 +89,5 @@ android:layout_marginBottom="16dp" android:layout_below="@id/sender_name" style="@style/MessageHeaderSnippetStyle" /> + </RelativeLayout> diff --git a/res/layout/conversation_view.xml b/res/layout/conversation_view.xml index 9bcd4f9ce..6689ee0cb 100644 --- a/res/layout/conversation_view.xml +++ b/res/layout/conversation_view.xml @@ -18,6 +18,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> + <com.android.mail.browse.ConversationContainer android:id="@+id/conversation_container" android:layout_width="match_parent" @@ -28,17 +29,22 @@ android:id="@+id/conversation_webview" android:layout_width="match_parent" android:layout_height="match_parent" - style="@style/ConversationViewPaddingStyle" - android:scrollbars="none" /> + android:focusable="false" + android:focusableInTouchMode="false" + android:scrollbars="none" + style="@style/ConversationViewPaddingStyle" /> <!-- scrolling overlay views go here --> <!-- topmost layer for floating views (e.g. snap header, New Message bar) --> <!-- ConversationContainer draws this child on the very top, above all scrolling views --> + <!-- This is also used to highlight the entire conversation on focus --> <FrameLayout android:id="@+id/conversation_topmost_overlay" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:background="?android:attr/selectableItemBackground" + android:focusable="true" /> </com.android.mail.browse.ConversationContainer> diff --git a/res/layout/conversation_view_header.xml b/res/layout/conversation_view_header.xml index cbb2ec4ed..99ab7ed53 100644 --- a/res/layout/conversation_view_header.xml +++ b/res/layout/conversation_view_header.xml @@ -21,8 +21,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/conversation_view_item_background_color" + android:focusable="true" android:orientation="horizontal" android:minHeight="88sp" + android:nextFocusDown="@+id/upper_header" android:paddingTop="16dp" android:paddingBottom="16dp" style="@style/ConversationHeaderStyle" > @@ -33,6 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" + android:nextFocusDown="@+id/upper_header" android:textAlignment="viewStart" style="@style/ConversationSubjectStyle" /> diff --git a/res/layout/super_collapsed_block.xml b/res/layout/super_collapsed_block.xml index ad0494b9b..00433fa58 100644 --- a/res/layout/super_collapsed_block.xml +++ b/res/layout/super_collapsed_block.xml @@ -20,8 +20,9 @@ android:id="@+id/super_collapsed_block" android:layout_width="match_parent" android:layout_height="wrap_content" + android:focusable="true" android:background="@color/message_header_background_color" - android:foreground="?android:attr/selectableItemBackground" > + android:foreground="?android:attr/selectableItemBackground"> <LinearLayout android:layout_width="match_parent" |