diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-06 00:59:12 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-06 00:59:12 +0200 |
| commit | d2ce770c1ab541aae20906c8e38056f24968aac4 (patch) | |
| tree | c683409c17c67ba8af80edc361ce07452b964288 /OpenKeychain/src/main/res/layout | |
| parent | 8e60bf70a1ef6bd7be3220afc45c9a59c231d2d4 (diff) | |
| parent | afda9d86f84fcd36aad8de4a4e9c1fe12b6b042c (diff) | |
| download | open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.tar.gz open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.tar.bz2 open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
5 files changed, 8 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index 9557bf61e..5955fe8b5 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -46,7 +46,7 @@ android:id="@+id/api_app_settings_app_icon" android:layout_width="48dp" android:layout_height="48dp" - android:src="@drawable/ic_launcher" /> + android:src="@mipmap/ic_launcher" /> <TextView android:id="@+id/api_app_settings_app_name" diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml index 20abb3965..c02b506af 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml @@ -17,7 +17,7 @@ android:layout_height="48dp" android:layout_alignParentTop="true" android:layout_marginRight="6dp" - android:src="@drawable/ic_launcher" /> + android:src="@mipmap/ic_launcher" /> <TextView android:id="@+id/api_app_settings_app_name" @@ -65,4 +65,4 @@ </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml index 9166f958e..f6eafdbda 100644 --- a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml +++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml @@ -11,7 +11,7 @@ android:layout_height="48dp" android:layout_marginLeft="8dp" android:layout_centerVertical="true" - android:src="@drawable/ic_launcher" /> + android:src="@mipmap/ic_launcher" /> <ImageView android:id="@+id/api_apps_adapter_install_icon" @@ -34,4 +34,4 @@ android:layout_toLeftOf="@+id/api_apps_adapter_install_icon" android:layout_toRightOf="@+id/api_apps_adapter_item_icon" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/help_about_fragment.xml b/OpenKeychain/src/main/res/layout/help_about_fragment.xml index dbcd97bfd..cbe1c3331 100644 --- a/OpenKeychain/src/main/res/layout/help_about_fragment.xml +++ b/OpenKeychain/src/main/res/layout/help_about_fragment.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_gravity="top" android:layout_marginRight="10dp" - android:src="@drawable/ic_launcher" /> + android:src="@mipmap/ic_launcher" /> </LinearLayout> <LinearLayout diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 3913122bc..560180407 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -54,7 +54,7 @@ android:fitsSystemWindows="true" android:focusable="false" android:scaleType="centerCrop" - android:src="@drawable/ic_launcher" /> + android:src="@mipmap/ic_launcher" /> <!-- text protection scrim --> <View @@ -222,4 +222,4 @@ app:layout_anchorGravity="bottom|right|end" tools:visibility="visible" /> -</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file +</android.support.design.widget.CoordinatorLayout> |