diff options
-rw-r--r-- | res/drawable-hdpi/ic_cv_loading_24dp.png | bin | 0 -> 3301 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_cv_loading_24dp.png | bin | 0 -> 3058 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_cv_loading_24dp.png | bin | 0 -> 3522 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_cv_loading_24dp.png | bin | 0 -> 3938 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ic_cv_loading_24dp.png | bin | 0 -> 4494 bytes | |||
-rw-r--r-- | res/layout-v17/super_collapsed_progress.xml | 28 | ||||
-rw-r--r-- | res/layout/super_collapsed_block.xml | 11 | ||||
-rw-r--r-- | res/layout/super_collapsed_progress.xml | 28 |
8 files changed, 10 insertions, 57 deletions
diff --git a/res/drawable-hdpi/ic_cv_loading_24dp.png b/res/drawable-hdpi/ic_cv_loading_24dp.png Binary files differnew file mode 100644 index 000000000..077b8d046 --- /dev/null +++ b/res/drawable-hdpi/ic_cv_loading_24dp.png diff --git a/res/drawable-mdpi/ic_cv_loading_24dp.png b/res/drawable-mdpi/ic_cv_loading_24dp.png Binary files differnew file mode 100644 index 000000000..d10e7678b --- /dev/null +++ b/res/drawable-mdpi/ic_cv_loading_24dp.png diff --git a/res/drawable-xhdpi/ic_cv_loading_24dp.png b/res/drawable-xhdpi/ic_cv_loading_24dp.png Binary files differnew file mode 100644 index 000000000..6f187991f --- /dev/null +++ b/res/drawable-xhdpi/ic_cv_loading_24dp.png diff --git a/res/drawable-xxhdpi/ic_cv_loading_24dp.png b/res/drawable-xxhdpi/ic_cv_loading_24dp.png Binary files differnew file mode 100644 index 000000000..38529dc41 --- /dev/null +++ b/res/drawable-xxhdpi/ic_cv_loading_24dp.png diff --git a/res/drawable-xxxhdpi/ic_cv_loading_24dp.png b/res/drawable-xxxhdpi/ic_cv_loading_24dp.png Binary files differnew file mode 100644 index 000000000..53490758e --- /dev/null +++ b/res/drawable-xxxhdpi/ic_cv_loading_24dp.png diff --git a/res/layout-v17/super_collapsed_progress.xml b/res/layout-v17/super_collapsed_progress.xml deleted file mode 100644 index d6a599a1b..000000000 --- a/res/layout-v17/super_collapsed_progress.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> -<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/super_collapsed_progress" - android:layout_width="40sp" - android:layout_height="40sp" - android:layout_gravity="center_vertical" - android:layout_marginStart="@dimen/message_header_icon_additional_margin_start" - android:background="@drawable/super_collapse_circle" - android:indeterminate="true" - android:indeterminateBehavior="repeat" - android:visibility="gone" - style="?android:attr/progressBarStyle" />
\ No newline at end of file diff --git a/res/layout/super_collapsed_block.xml b/res/layout/super_collapsed_block.xml index 20968f5e7..a68f7b5df 100644 --- a/res/layout/super_collapsed_block.xml +++ b/res/layout/super_collapsed_block.xml @@ -54,6 +54,15 @@ android:textSize="@dimen/super_collapsed_text_size" style="@style/MessageHeaderIconStyle" /> - <include layout="@layout/super_collapsed_progress" /> + <ImageView + android:id="@+id/super_collapsed_progress" + android:layout_width="40sp" + android:layout_height="40sp" + android:background="@drawable/super_collapse_circle" + android:contentDescription="@null" + android:scaleType="center" + android:src="@drawable/ic_cv_loading_24dp" + android:visibility="gone" + style="@style/MessageHeaderIconStyle" /> </com.android.mail.browse.SuperCollapsedBlock> diff --git a/res/layout/super_collapsed_progress.xml b/res/layout/super_collapsed_progress.xml deleted file mode 100644 index c7a0ec64f..000000000 --- a/res/layout/super_collapsed_progress.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> -<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/super_collapsed_progress" - android:layout_width="40sp" - android:layout_height="40sp" - android:layout_gravity="center_vertical" - android:layout_marginLeft="@dimen/message_header_icon_additional_margin_start" - android:background="@drawable/super_collapse_circle" - android:indeterminate="true" - android:indeterminateBehavior="repeat" - android:visibility="gone" - style="?android:attr/progressBarStyle" />
\ No newline at end of file |