summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/drawable-hdpi/ic_menu_revert_holo_dark.pngbin436 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_revert_holo_dark.pngbin308 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_revert_holo_dark.pngbin575 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_menu_revert_holo_dark.pngbin2001 -> 0 bytes
-rw-r--r--res/layout/swipe_leavebehind_body.xml36
-rw-r--r--res/layout/undo_notification.xml42
-rw-r--r--res/values-ldrtl/styles-ldrtl.xml13
-rw-r--r--res/values/animation_constants.xml2
-rw-r--r--res/values/colors.xml5
-rw-r--r--res/values/dimen.xml6
-rw-r--r--res/values/styles.xml23
-rw-r--r--src/com/android/mail/ui/LeaveBehindItem.java8
-rw-r--r--src/com/android/mail/utils/NotificationUtils.java6
13 files changed, 30 insertions, 111 deletions
diff --git a/res/drawable-hdpi/ic_menu_revert_holo_dark.png b/res/drawable-hdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index 6165a98a7..000000000
--- a/res/drawable-hdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_revert_holo_dark.png b/res/drawable-mdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index 97ee13da3..000000000
--- a/res/drawable-mdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_revert_holo_dark.png b/res/drawable-xhdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index 48ff5bcda..000000000
--- a/res/drawable-xhdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_revert_holo_dark.png b/res/drawable-xxhdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index b51df8ab1..000000000
--- a/res/drawable-xxhdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/swipe_leavebehind_body.xml b/res/layout/swipe_leavebehind_body.xml
index cfe88581d..106c7e8ae 100644
--- a/res/layout/swipe_leavebehind_body.xml
+++ b/res/layout/swipe_leavebehind_body.xml
@@ -18,47 +18,25 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clickable="true"
android:orientation="horizontal">
+
<TextView
- android:id="@+id/undo_descriptionview"
- android:layout_width="0dip"
+ android:id="@+id/undo_description_text"
+ android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
- android:textColor="@android:color/white"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:clickable="true"
android:gravity="center_vertical"
+ android:textColor="@android:color/white"
+ android:textSize="16sp"
style="@style/UndoDescriptionStyle" />
- <View
- android:id="@+id/undo_separator"
- android:layout_width="1dip"
- android:layout_height="match_parent"
- android:background="@android:color/white"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="16dp" />
-
- <ImageView
- android:id="@+id/undo_icon"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:src="@drawable/ic_menu_revert_holo_dark"
- android:background="?android:attr/selectableItemBackground"
- android:duplicateParentState="true"
- style="@style/UndoIconStyle" />
-
<TextView
android:id="@+id/undo_text"
- style="@style/UndoTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/undo"
- android:textAllCaps="true"
android:gravity="center_vertical"
- android:textColor="@android:color/white"
- android:background="?android:attr/selectableItemBackground"
- android:duplicateParentState="true"/>
+ style="@style/UndoTextStyle" />
+
</LinearLayout>
diff --git a/res/layout/undo_notification.xml b/res/layout/undo_notification.xml
index 9358da85c..0a48e9f11 100644
--- a/res/layout/undo_notification.xml
+++ b/res/layout/undo_notification.xml
@@ -26,58 +26,30 @@
internal:layout_minHeight="64dp"
android:background="@drawable/notification_bg" >
- <ImageView
- android:layout_width="@android:dimen/notification_large_icon_width"
- android:layout_height="@android:dimen/notification_large_icon_height"
- android:background="@color/notification_template_icon_low_bg"
- android:scaleType="center"
- android:src="@drawable/ic_notification_mail_24dp" />
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="fill_vertical"
android:gravity="top"
android:minHeight="@android:dimen/notification_large_icon_height"
- android:orientation="horizontal"
- android:paddingBottom="2dp"
- android:paddingTop="2dp"
- style="@style/UndoNotificationStyle" >
+ android:orientation="horizontal" >
<TextView
android:id="@+id/description_text"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
android:layout_weight="1"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:gravity="center_vertical" />
-
- <ImageView
- android:layout_width="1dip"
- android:layout_height="match_parent"
- android:layout_marginBottom="10dip"
- android:layout_marginRight="12dip"
- android:layout_marginTop="10dip"
- android:src="#aaaaaa" />
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="4dip"
- android:src="@drawable/ic_menu_revert_holo_dark" />
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:textColor="@android:color/white"
+ android:textSize="16sp"
+ style="@style/UndoDescriptionStyle" />
<TextView
- style="@style/UndoTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginLeft="4dip"
android:gravity="center_vertical"
- android:text="@string/undo"
- android:textAllCaps="true" />
+ style="@style/UndoTextStyle" />
</LinearLayout>
</FrameLayout>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 19b86ccd8..614138370 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -45,10 +45,6 @@
<item name="android:paddingEnd">@dimen/send_mail_as_padding</item>
</style>
- <style name="UndoTextStyle" parent="AbstractUndoTextStyle">
- <item name="android:paddingEnd">@dimen/undo_text_padding</item>
- </style>
-
<style name="MessageHeaderIconStyle">
<item name="android:layout_marginStart">@dimen/message_header_icon_additional_margin_start</item>
</style>
@@ -105,10 +101,6 @@
<item name="android:layout_marginStart">@dimen/attachment_icon_padding</item>
</style>
- <style name="UndoNotificationStyle">
- <item name="android:layout_marginStart">@android:dimen/notification_large_icon_width</item>
- </style>
-
<style name="UnreadCountWithMarginEndStyle" parent="UnreadCountRelativeLayout">
<item name="android:layout_marginEnd">@dimen/folder_list_item_end_margin</item>
<item name="android:layout_alignParentEnd">true</item>
@@ -372,11 +364,6 @@
<item name="android:paddingStart">@dimen/undo_description_padding</item>
</style>
- <style name="UndoIconStyle">
- <item name="android:paddingStart">@dimen/undo_icon_padding_start</item>
- <item name="android:paddingEnd">@dimen/undo_icon_padding_end</item>
- </style>
-
<style name="AccountItemNameStyle">
<item name="android:paddingStart">@dimen/account_item_name_start_padding</item>
<item name="android:paddingEnd">@dimen/account_item_name_end_padding</item>
diff --git a/res/values/animation_constants.xml b/res/values/animation_constants.xml
index 65bb19034..532d14430 100644
--- a/res/values/animation_constants.xml
+++ b/res/values/animation_constants.xml
@@ -21,7 +21,7 @@
<integer name="dialog_animationDefaultDur">220</integer>
<integer name="dialog_animationShortDur">150</integer>
<integer name="shrink_animation_duration">200</integer>
- <integer name="slide_animation_duration">320</integer>
+ <integer name="slide_animation_duration">200</integer>
<integer name="fade_in_animation_duration">300</integer>
<!-- Swipe constants -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 64b9abe3f..9b6834aa5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -43,7 +43,7 @@
<color name="ap_overflow_text_color">#ff4f4c4c</color>
<color name="attachment_bg_color">#ffdddddd</color>
- <color name="swiped_bg_color">#ff999999</color>
+ <color name="swiped_bg_color">@color/text_color_grey</color>
<color name="holo_light_background_color">#ffe8e8e8</color>
<!-- Keep the following two colors in sync with LabelColorUtils.DEFAULT_COLORS (UnifiedGmail) -->
<color name="default_folder_background_color">#dddddd</color>
@@ -98,8 +98,7 @@
<color name="low_spam_color">#333333</color>
<color name="low_spam_warning_background_color">#FFF1A8</color>
- <color name="notification_template_icon_low_bg">#0cffffff</color>
- <color name="notification_icon_gmail_red">#da4336</color>
+ <color name="notification_icon_color">#da4336</color>
<!-- Search colors -->
<color name="search_query_hint_text">@color/light_gray</color>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 4fb8f357c..8f7909a8e 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -119,7 +119,6 @@
<dimen name="tile_divider_width">1dp</dimen>
<dimen name="checked_text_padding">16dip</dimen>
<dimen name="send_mail_as_padding">8dip</dimen>
- <dimen name="undo_text_padding">16dip</dimen>
<dimen name="dismiss_separator_padding">16dip</dimen>
<dimen name="teaser_text_padding">16dp</dimen>
<dimen name="attachment_padding_start">16dp</dimen>
@@ -197,9 +196,8 @@
<dimen name="avatar_border_width">.5dp</dimen>
<dimen name="progress_bar_height">12dp</dimen>
- <dimen name="undo_description_padding">16dip</dimen>
- <dimen name="undo_icon_padding_start">12dip</dimen>
- <dimen name="undo_icon_padding_end">8dip</dimen>
+ <dimen name="undo_text_padding">24dp</dimen>
+ <dimen name="undo_description_padding">24dp</dimen>
<!-- The width of the wearable image background. -->
<dimen name="wearable_background_width">320dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 71ea20bee..3a75b7937 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -244,14 +244,14 @@
</style>
<!-- Undo bar styles -->
- <style name="AbstractUndoTextStyle">
- <item name="android:textSize">12sp</item>
- <item name="android:textColor">#aaaaaa</item>
- <item name="android:textStyle">bold</item>
- </style>
-
- <style name="UndoTextStyle" parent="AbstractUndoTextStyle">
+ <style name="UndoTextStyle">
+ <item name="android:background">?android:attr/selectableItemBackground</item>
+ <item name="android:paddingLeft">@dimen/undo_text_padding</item>
<item name="android:paddingRight">@dimen/undo_text_padding</item>
+ <item name="android:text">@string/undo</item>
+ <item name="android:textAllCaps">true</item>
+ <item name="android:textColor">#feb500</item>
+ <item name="android:textSize">16sp</item>
</style>
<!-- End undo bar styles -->
@@ -649,10 +649,6 @@
<item name="android:layout_marginLeft">@dimen/attachment_icon_padding</item>
</style>
- <style name="UndoNotificationStyle">
- <item name="android:layout_marginLeft">@android:dimen/notification_large_icon_width</item>
- </style>
-
<style name="UnreadCountWithMarginEndStyle" parent="UnreadCountRelativeLayout">
<item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
<item name="android:layout_alignParentRight">true</item>
@@ -956,11 +952,6 @@
<item name="android:paddingLeft">@dimen/undo_description_padding</item>
</style>
- <style name="UndoIconStyle">
- <item name="android:paddingLeft">@dimen/undo_icon_padding_start</item>
- <item name="android:paddingRight">@dimen/undo_icon_padding_end</item>
- </style>
-
<style name="AccountItemNameStyle">
<item name="android:paddingLeft">@dimen/account_item_name_start_padding</item>
<item name="android:paddingRight">@dimen/account_item_name_end_padding</item>
diff --git a/src/com/android/mail/ui/LeaveBehindItem.java b/src/com/android/mail/ui/LeaveBehindItem.java
index afd44fe71..45e510412 100644
--- a/src/com/android/mail/ui/LeaveBehindItem.java
+++ b/src/com/android/mail/ui/LeaveBehindItem.java
@@ -103,9 +103,6 @@ public class LeaveBehindItem extends FrameLayout implements OnClickListener, Swi
cursor.undo(getContext(), mAccount.undoUri);
}
}
- } else if (id == R.id.undo_descriptionview) {
- // Essentially, makes sure that tapping description view doesn't highlight
- // either the undo button icon or text.
}
}
@@ -122,7 +119,7 @@ public class LeaveBehindItem extends FrameLayout implements OnClickListener, Swi
// and button text as selected since they set duplicateParentState to true
mSwipeableContent.setOnClickListener(this);
mSwipeableContent.setAlpha(TRANSPARENT);
- mText = ((TextView) findViewById(R.id.undo_descriptionview));
+ mText = ((TextView) findViewById(R.id.undo_description_text));
mText.setText(Utils.convertHtmlToPlainText(mUndoOp
.getSingularDescription(getContext(), folder)));
mText.setOnClickListener(this);
@@ -164,10 +161,7 @@ public class LeaveBehindItem extends FrameLayout implements OnClickListener, Swi
/**
* Animate shrinking the height of this view.
- * @param item the conversation to animate
* @param listener the method to call when the animation is done
- * @param undo true if an operation is being undone. We animate the item
- * away during delete. Undoing populates the item.
*/
public void startShrinkAnimation(AnimatorListener listener) {
if (!mAnimating) {
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 56704b438..4475ceb87 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -631,7 +631,7 @@ public class NotificationUtils {
if (com.android.mail.utils.Utils.isRunningLOrLater()) {
notification.setColor(
- context.getResources().getColor(R.color.notification_icon_gmail_red));
+ context.getResources().getColor(R.color.notification_icon_color));
}
if(unseenCount > 1) {
@@ -865,7 +865,7 @@ public class NotificationUtils {
.setWhen(when);
if (com.android.mail.utils.Utils.isRunningLOrLater()) {
- builder.setColor(context.getResources().getColor(R.color.notification_icon_gmail_red));
+ builder.setColor(context.getResources().getColor(R.color.notification_icon_color));
}
// if this public notification summarizes multiple single notifications, mark it as the
@@ -1082,7 +1082,7 @@ public class NotificationUtils {
if (com.android.mail.utils.Utils.isRunningLOrLater()) {
conversationNotif.setColor(
context.getResources()
- .getColor(R.color.notification_icon_gmail_red));
+ .getColor(R.color.notification_icon_color));
}
conversationNotif.setContentText(digestLine);
Intent conversationNotificationIntent = createViewConversationIntent(
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 12:44:01 +0000