commit | 2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:40:11 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:40:11 2012 -0700 |
tree | 16fc3c0135facf1a0d890fc1fe5e122505be4029 | |
parent | d294cac5d83eb18dea9b2f84d4202b13f3ea3c43 [diff] | |
parent | eabb31b088b0083833eef77cf2e236f8f6124ef0 [diff] | |
parent | 0c762a978ecd4c6145484bc68627cb8fd9c60209 [diff] |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge Change-Id: I204c53690f99803900e6613188a6d9a14370e007
diff --git a/res/drawable-hdpi/ic_launcher_application.png b/res/drawable-hdpi/ic_launcher_application.png deleted file mode 100644 index 882eb14..0000000 --- a/res/drawable-hdpi/ic_launcher_application.png +++ /dev/null Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_application.png b/res/drawable-mdpi/ic_launcher_application.png deleted file mode 100644 index d7ff417..0000000 --- a/res/drawable-mdpi/ic_launcher_application.png +++ /dev/null Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_application.png b/res/drawable-xhdpi/ic_launcher_application.png deleted file mode 100644 index 83acf89..0000000 --- a/res/drawable-xhdpi/ic_launcher_application.png +++ /dev/null Binary files differ
diff --git a/res/layout-sw720dp/external_widget_drop_list_item.xml b/res/layout-sw720dp/external_widget_drop_list_item.xml index 84f40ed..a24ad3a 100644 --- a/res/layout-sw720dp/external_widget_drop_list_item.xml +++ b/res/layout-sw720dp/external_widget_drop_list_item.xml
@@ -28,7 +28,7 @@ android:maxWidth="32dp" android:maxHeight="32dp" android:scaleType="fitCenter" - android:src="@drawable/ic_launcher_application" /> + android:src="@mipmap/ic_launcher_application" /> <TextView android:id="@+id/provider" android:layout_width="match_parent"
diff --git a/res/mipmap-hdpi/ic_launcher_application.png b/res/mipmap-hdpi/ic_launcher_application.png new file mode 100644 index 0000000..b9aa101 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_application.png Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_application.png b/res/mipmap-mdpi/ic_launcher_application.png new file mode 100644 index 0000000..4771b85 --- /dev/null +++ b/res/mipmap-mdpi/ic_launcher_application.png Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_application.png b/res/mipmap-xhdpi/ic_launcher_application.png new file mode 100644 index 0000000..932f0f7 --- /dev/null +++ b/res/mipmap-xhdpi/ic_launcher_application.png Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_application.png b/res/mipmap-xxhdpi/ic_launcher_application.png new file mode 100644 index 0000000..7fc739a --- /dev/null +++ b/res/mipmap-xxhdpi/ic_launcher_application.png Binary files differ