diff --git a/.classpath b/.classpath index 323d9666c..7c3f645a0 100644 --- a/.classpath +++ b/.classpath @@ -9,5 +9,6 @@ + diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fa40d48d5..e1fff9465 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ - - - - - -
- No text -
- - diff --git a/assets/loading.html b/assets/loading.html deleted file mode 100644 index fc8c14ac8..000000000 --- a/assets/loading.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - -
- Loading... -
-
-
-
-
- -
- - \ No newline at end of file diff --git a/assets/test.html b/assets/test.html deleted file mode 100644 index 09d6f119e..000000000 --- a/assets/test.html +++ /dev/null @@ -1,18 +0,0 @@ - - -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Phasellus dui dui, luctus sit amet, hendrerit ac, blandit quis, diam. Duis libero velit, elementum id, mattis ut, fermentum aliquet, tortor. Maecenas tincidunt egestas pede. Integer sagittis ipsum ut lorem. Morbi egestas egestas sapien. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis eget erat ac sem iaculis sollicitudin. Maecenas in velit id mauris cursus tincidunt. Sed ultrices elit in sapien ullamcorper imperdiet. Nunc viverra, lacus id varius elementum, nisl turpis lacinia tellus, sit amet viverra neque odio quis nisl. Quisque facilisis, ipsum non vulputate malesuada, leo augue elementum tortor, nec eleifend tellus lectus non massa. -

-Maecenas pulvinar rutrum risus. Phasellus mattis arcu sit amet neque. Aliquam sed quam at nulla laoreet pretium. Proin elit. Integer ullamcorper dolor a pede. Nam lobortis quam ut mauris. Pellentesque non mauris ut lacus hendrerit iaculis. In volutpat nulla et turpis. Fusce mollis. Aliquam sit amet tortor fermentum orci lacinia convallis. Donec tincidunt tortor sed erat sollicitudin gravida. In hac habitasse platea dictumst. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed pulvinar arcu consectetuer dolor. Nunc luctus aliquam leo. In hac habitasse platea dictumst. Praesent et mi sit amet ligula blandit hendrerit. Nam aliquam tincidunt est. Aliquam erat volutpat. -

-Curabitur augue. Fusce pulvinar nisi vitae diam. Donec dictum. Sed suscipit convallis magna. Ut hendrerit tortor in mauris. In at diam. Maecenas commodo. Aliquam erat volutpat. Nunc odio eros, vestibulum at, sodales id, congue et, risus. Curabitur feugiat blandit lacus. Nulla gravida placerat enim. Nunc turpis. Praesent malesuada. -

-Aenean quis erat. Vivamus non ipsum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed metus magna, porta eu, ultricies vitae, vulputate et, urna. Sed pulvinar, massa at ultricies rhoncus, nunc eros dapibus felis, quis congue risus orci rhoncus nibh. Pellentesque quam ante, laoreet vitae, iaculis a, gravida in, nibh. In hac habitasse platea dictumst. Aliquam erat volutpat. Suspendisse augue neque, posuere eu, sollicitudin quis, sagittis et, massa. Maecenas varius sem sodales ipsum. Donec congue mi nec orci. Nam pede ipsum, varius sed, condimentum ac, rhoncus non, lorem. Integer vestibulum, neque vitae ornare euismod, mauris turpis congue massa, non venenatis arcu lorem eget metus. Sed sollicitudin, enim aliquam pharetra cursus, neque augue bibendum leo, vitae ullamcorper ante felis nec massa. Maecenas vitae urna. Proin tincidunt, urna eu sodales vulputate, nisl tellus pretium ligula, ut venenatis metus nulla eu lectus. Integer urna purus, sagittis ut, posuere sed, sagittis non, mauris. Nunc eros risus, lacinia sit amet, dictum in, faucibus quis, urna. Fusce dictum mattis enim. Vivamus luctus sagittis felis. -

-Fusce pulvinar, erat a facilisis congue, lacus libero imperdiet dui, nec luctus justo neque sit amet mauris. Praesent sodales. Sed sed nisl a arcu tempus placerat. Duis sagittis risus. Aliquam tristique. Ut a mi. Integer volutpat, turpis vitae lobortis blandit, lorem sapien suscipit arcu, sit amet dignissim felis mauris vitae ipsum. Sed elit. Mauris elementum, pede nec accumsan pretium, leo metus fringilla erat, at feugiat turpis arcu pretium urna. Morbi lorem tellus, commodo sed, convallis id, suscipit sed, leo. Donec egestas ultricies tellus. Curabitur sapien orci, interdum nec, molestie at, pharetra eu, magna. Duis pharetra orci sed felis posuere malesuada. Donec nec nisi non urna ultricies porttitor. Maecenas lectus. Sed dignissim malesuada justo. Nunc rutrum consectetuer nunc. - - - more text - - more text - - \ No newline at end of file diff --git a/project.properties b/project.properties index 6b2d4bf93..46fb34716 100644 --- a/project.properties +++ b/project.properties @@ -11,5 +11,5 @@ split.density=false java.encoding=utf8 # Project target. -target=android-10 +target=android-15 extensible.libs.classpath=compile-only-libs diff --git a/res/drawable-hdpi/divider_horizontal_email.9.png b/res/drawable-hdpi/divider_horizontal_email.9.png index 8358af9c3..46f5f48d5 100644 Binary files a/res/drawable-hdpi/divider_horizontal_email.9.png and b/res/drawable-hdpi/divider_horizontal_email.9.png differ diff --git a/res/drawable/divider_horizontal_email.9.png b/res/drawable/divider_horizontal_email.9.png index 1f56364f2..46f5f48d5 100644 Binary files a/res/drawable/divider_horizontal_email.9.png and b/res/drawable/divider_horizontal_email.9.png differ diff --git a/res/drawable/separator_area_background.xml b/res/drawable/message_view_header_background.xml similarity index 100% rename from res/drawable/separator_area_background.xml rename to res/drawable/message_view_header_background.xml diff --git a/res/layout/choose_account.xml b/res/layout/choose_account.xml deleted file mode 100644 index 09c8fe2d8..000000000 --- a/res/layout/choose_account.xml +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/res/layout/choose_account_item.xml b/res/layout/choose_account_item.xml index d212594f0..910312441 100644 --- a/res/layout/choose_account_item.xml +++ b/res/layout/choose_account_item.xml @@ -3,37 +3,25 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" - android:paddingRight="6dip" - android:paddingBottom="2dip" - android:descendantFocusability="blocksDescendants" - android:gravity="center_vertical" > - + android:background="#cccccc" + android:gravity="left|center_vertical"> + android:layout_width="6dp"/> - - - - - + android:singleLine="true" + android:ellipsize="end" + android:paddingTop="8dp" + android:paddingLeft="18dp" + android:paddingRight="4dp" + android:paddingBottom="8dp" + android:textColor="?android:attr/textColorPrimary" + android:textAppearance="?android:attr/textAppearanceMedium"/> diff --git a/res/layout/choose_identity_item.xml b/res/layout/choose_identity_item.xml index 0f1999003..e641a4025 100644 --- a/res/layout/choose_identity_item.xml +++ b/res/layout/choose_identity_item.xml @@ -4,45 +4,27 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:paddingRight="6dip" - android:paddingBottom="2dip" - android:descendantFocusability="blocksDescendants" - android:gravity="center_vertical" > + android:orientation="vertical" + android:gravity="center_vertical" + android:paddingLeft="12dp" + android:paddingRight="4dp"> - - - + android:singleLine="true" + android:ellipsize="end" + android:textColor="?android:attr/textColorPrimary" + android:textAppearance="?android:attr/textAppearanceSmall"/> - - - - - + diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml index 2cafb2428..826040c99 100644 --- a/res/layout/message_compose.xml +++ b/res/layout/message_compose.xml @@ -2,15 +2,14 @@ + android:orientation="vertical"> + android:scrollbarStyle="insideOverlay" + android:fillViewport="true"> + android:background="#45bcbcbc"> - + android:layout_marginRight="6dip"/> + - - + + - + android:layout_width="wrap_content" + android:layout_marginTop="1dip"/> + + + - - - + + + + + + + - - + + - + android:layout_width="wrap_content" + android:src="@drawable/ic_button_contacts"/> + + @@ -154,7 +155,6 @@ android:id="@+id/userId" android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@android:color/primary_text_light" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -162,7 +162,6 @@ android:id="@+id/userIdRest" android:textSize="10sp" android:ellipsize="end" - android:textColor="@android:color/primary_text_light" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -173,7 +172,6 @@