diff options
author | Dmitry Donskoy <donskdmitry@mail.ru> | 2019-05-13 18:57:34 +0300 |
---|---|---|
committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2019-05-17 18:45:59 +0300 |
commit | d6d9dfb8f8205f773940cb3fcde0b3c18abef3be (patch) | |
tree | 0394bf49443b6b369d968c1888999a43680d9c73 /android | |
parent | 3b75fbd1b9a46e29bb85470990efb88c9562ff56 (diff) |
[android] Moved content to mipmap
Diffstat (limited to 'android')
-rw-r--r-- | android/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | android/res/layout/activity_download_resources.xml | 6 | ||||
-rw-r--r-- | android/res/layout/fragment_google_plus_dialog.xml | 4 | ||||
-rw-r--r-- | android/res/mipmap-hdpi/ic_launcher.png (renamed from android/res/drawable-hdpi/ic_launcher.png) | bin | 6022 -> 6022 bytes | |||
-rw-r--r-- | android/res/mipmap-mdpi/ic_launcher.png (renamed from android/res/drawable-mdpi/ic_launcher.png) | bin | 4009 -> 4009 bytes | |||
-rw-r--r-- | android/res/mipmap-v26/ic_launcher.xml (renamed from android/res/drawable-v26/ic_launcher.xml) | 0 | ||||
-rw-r--r-- | android/res/mipmap-xhdpi/ic_launcher.png (renamed from android/res/drawable-xhdpi/ic_launcher.png) | bin | 8050 -> 8050 bytes | |||
-rw-r--r-- | android/res/mipmap-xxhdpi/ic_launcher.png (renamed from android/res/drawable-xxhdpi/ic_launcher.png) | bin | 12156 -> 12156 bytes | |||
-rw-r--r-- | android/res/mipmap-xxxhdpi/ic_launcher.png (renamed from android/res/drawable-xxxhdpi/ic_launcher.png) | bin | 16089 -> 16089 bytes |
9 files changed, 6 insertions, 6 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 78be8253a2..194b7cbb36 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -59,7 +59,7 @@ <application android:name=".MwmApplication" android:allowBackup="true" - android:icon="@drawable/ic_launcher" + android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/MwmTheme" android:supportsRtl="false" diff --git a/android/res/layout/activity_download_resources.xml b/android/res/layout/activity_download_resources.xml index e0460ba76e..92dc85de47 100644 --- a/android/res/layout/activity_download_resources.xml +++ b/android/res/layout/activity_download_resources.xml @@ -16,9 +16,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_base_plus" - android:drawableLeft="@drawable/ic_launcher" + android:drawableLeft="@mipmap/ic_launcher" android:drawablePadding="@dimen/margin_base" - android:drawableStart="@drawable/ic_launcher" + android:drawableStart="@mipmap/ic_launcher" android:padding="@dimen/margin_half" android:textAppearance="@style/MwmTextAppearance.Body2" tools:text="@string/download_resources"/> @@ -60,4 +60,4 @@ android:visibility="gone"/> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/android/res/layout/fragment_google_plus_dialog.xml b/android/res/layout/fragment_google_plus_dialog.xml index 078b476ba3..a8197da752 100644 --- a/android/res/layout/fragment_google_plus_dialog.xml +++ b/android/res/layout/fragment_google_plus_dialog.xml @@ -9,7 +9,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:padding="@dimen/margin_base" - android:src="@drawable/ic_launcher"/> + android:src="@mipmap/ic_launcher"/> <TextView style="@style/MwmWidget.TextView" @@ -41,4 +41,4 @@ android:layout_margin="@dimen/margin_half" plus:annotation="inline" plus:size="normal"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png Binary files differindex ed20a1ebdd..ed20a1ebdd 100644 --- a/android/res/drawable-hdpi/ic_launcher.png +++ b/android/res/mipmap-hdpi/ic_launcher.png diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png Binary files differindex 2dc8607cf5..2dc8607cf5 100644 --- a/android/res/drawable-mdpi/ic_launcher.png +++ b/android/res/mipmap-mdpi/ic_launcher.png diff --git a/android/res/drawable-v26/ic_launcher.xml b/android/res/mipmap-v26/ic_launcher.xml index ea737cd487..ea737cd487 100644 --- a/android/res/drawable-v26/ic_launcher.xml +++ b/android/res/mipmap-v26/ic_launcher.xml diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png Binary files differindex 0f397a3a1d..0f397a3a1d 100644 --- a/android/res/drawable-xhdpi/ic_launcher.png +++ b/android/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex d32258460c..d32258460c 100644 --- a/android/res/drawable-xxhdpi/ic_launcher.png +++ b/android/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/res/drawable-xxxhdpi/ic_launcher.png b/android/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex dfe22d1f0a..dfe22d1f0a 100644 --- a/android/res/drawable-xxxhdpi/ic_launcher.png +++ b/android/res/mipmap-xxxhdpi/ic_launcher.png |