Merge "Import translations. DO NOT MERGE" into jb-ub-mail
diff --git a/res/layout-sw600dp/compose.xml b/res/layout-sw600dp/compose.xml
index f4b8c1c..92c6db3 100644
--- a/res/layout-sw600dp/compose.xml
+++ b/res/layout-sw600dp/compose.xml
@@ -68,7 +68,18 @@
android:layout_marginRight="@dimen/compose_area_right_padding"
android:paddingBottom="0dip"
android:paddingLeft="0dip"
- android:visibility="gone" />
+ android:visibility="gone" >
+ <com.android.mail.ui.AttachmentTileGrid
+ android:id="@+id/attachment_tile_grid"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dip" />
+ <LinearLayout
+ android:id="@+id/attachment_bar_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" />
+ </com.android.mail.compose.AttachmentsView>
<!-- Compose Area -->
<FrameLayout android:layout_width="match_parent"
diff --git a/res/layout/compose.xml b/res/layout/compose.xml
index 817f7cd..ede99df 100644
--- a/res/layout/compose.xml
+++ b/res/layout/compose.xml
@@ -64,8 +64,8 @@
android:layout_marginBottom="8dip" />
<LinearLayout
android:id="@+id/attachment_bar_list"
- android:layout_height="wrap_content"
android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical" />
</com.android.mail.compose.AttachmentsView>
<!-- Body -->
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index bc501ad..fd81b70 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -613,7 +613,7 @@
LogUtils.d(LOG_TAG, "AbstractController.onOptionsItemSelected(%d) called.", id);
boolean handled = true;
final Collection<Conversation> target = Conversation.listOf(mCurrentConversation);
- final Settings settings = mAccount.settings;
+ final Settings settings = (mAccount == null) ? null : mAccount.settings;
switch (id) {
case R.id.archive: {
final boolean showDialog = (settings != null && settings.confirmArchive);