From 49e2fa5c5e0389d5a457b99fd785ce33f3977c65 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Thu, 21 Aug 2014 11:21:42 -0700
Subject: Update the Split example

Caveat: There are two bugs:

- Mipmap definitions get placed in all splits.
- mdpi drawable doesn't get split properly.

Change-Id: I53b8e54cbcb3dfba495ec68e602f98666e8883a7
---
 tests/Split/Android.mk                                   |   3 +--
 tests/Split/AndroidManifest.xml                          |   3 ++-
 tests/Split/res/drawable-hdpi/image.png                  | Bin 0 -> 881 bytes
 tests/Split/res/drawable-mdpi/image.png                  | Bin 0 -> 604 bytes
 tests/Split/res/drawable-xhdpi/image.png                 | Bin 0 -> 1395 bytes
 tests/Split/res/drawable-xxhdpi/image.png                | Bin 0 -> 2341 bytes
 tests/Split/res/layout/main.xml                          |  10 ++++++++--
 tests/Split/res/mipmap-hdpi/ic_app.png                   | Bin 0 -> 1725 bytes
 tests/Split/res/mipmap-mdpi/ic_app.png                   | Bin 0 -> 1135 bytes
 tests/Split/res/mipmap-xhdpi/ic_app.png                  | Bin 0 -> 2357 bytes
 tests/Split/res/mipmap-xxhdpi/ic_app.png                 | Bin 0 -> 3555 bytes
 tests/Split/res/mipmap-xxxhdpi/ic_app.png                | Bin 0 -> 4778 bytes
 .../src/java/com/android/example/split/ActivityMain.java |   4 +---
 13 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 tests/Split/res/drawable-hdpi/image.png
 create mode 100644 tests/Split/res/drawable-mdpi/image.png
 create mode 100644 tests/Split/res/drawable-xhdpi/image.png
 create mode 100644 tests/Split/res/drawable-xxhdpi/image.png
 create mode 100644 tests/Split/res/mipmap-hdpi/ic_app.png
 create mode 100644 tests/Split/res/mipmap-mdpi/ic_app.png
 create mode 100644 tests/Split/res/mipmap-xhdpi/ic_app.png
 create mode 100644 tests/Split/res/mipmap-xxhdpi/ic_app.png
 create mode 100644 tests/Split/res/mipmap-xxxhdpi/ic_app.png

(limited to 'tests/Split')

diff --git a/tests/Split/Android.mk b/tests/Split/Android.mk
index 7884d4d..b068bef 100644
--- a/tests/Split/Android.mk
+++ b/tests/Split/Android.mk
@@ -20,8 +20,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_PACKAGE_NAME := Split
 
-LOCAL_AAPT_FLAGS := --split fr,de
-LOCAL_AAPT_FLAGS += -v
+LOCAL_PACKAGE_SPLITS := mdpi-v4 hdpi-v4 xhdpi-v4 xxhdpi-v4
 
 LOCAL_MODULE_TAGS := tests
 
diff --git a/tests/Split/AndroidManifest.xml b/tests/Split/AndroidManifest.xml
index a4956a7..d5552de 100644
--- a/tests/Split/AndroidManifest.xml
+++ b/tests/Split/AndroidManifest.xml
@@ -17,7 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.example.split">
     <application android:label="@string/app_title">
-        <activity android:name="ActivityMain">
+        <activity android:name="ActivityMain"
+            android:icon="@mipmap/ic_app">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/tests/Split/res/drawable-hdpi/image.png b/tests/Split/res/drawable-hdpi/image.png
new file mode 100644
index 0000000..dcf4242
Binary files /dev/null and b/tests/Split/res/drawable-hdpi/image.png differ
diff --git a/tests/Split/res/drawable-mdpi/image.png b/tests/Split/res/drawable-mdpi/image.png
new file mode 100644
index 0000000..3437952
Binary files /dev/null and b/tests/Split/res/drawable-mdpi/image.png differ
diff --git a/tests/Split/res/drawable-xhdpi/image.png b/tests/Split/res/drawable-xhdpi/image.png
new file mode 100644
index 0000000..68b2f8e
Binary files /dev/null and b/tests/Split/res/drawable-xhdpi/image.png differ
diff --git a/tests/Split/res/drawable-xxhdpi/image.png b/tests/Split/res/drawable-xxhdpi/image.png
new file mode 100644
index 0000000..4bff9b9
Binary files /dev/null and b/tests/Split/res/drawable-xxhdpi/image.png differ
diff --git a/tests/Split/res/layout/main.xml b/tests/Split/res/layout/main.xml
index 36992a2..607cdb0 100644
--- a/tests/Split/res/layout/main.xml
+++ b/tests/Split/res/layout/main.xml
@@ -14,6 +14,12 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:src="@drawable/image"/>
+</RelativeLayout>
diff --git a/tests/Split/res/mipmap-hdpi/ic_app.png b/tests/Split/res/mipmap-hdpi/ic_app.png
new file mode 100644
index 0000000..ffcb9e5
Binary files /dev/null and b/tests/Split/res/mipmap-hdpi/ic_app.png differ
diff --git a/tests/Split/res/mipmap-mdpi/ic_app.png b/tests/Split/res/mipmap-mdpi/ic_app.png
new file mode 100644
index 0000000..35f5b45
Binary files /dev/null and b/tests/Split/res/mipmap-mdpi/ic_app.png differ
diff --git a/tests/Split/res/mipmap-xhdpi/ic_app.png b/tests/Split/res/mipmap-xhdpi/ic_app.png
new file mode 100644
index 0000000..bfe71fe
Binary files /dev/null and b/tests/Split/res/mipmap-xhdpi/ic_app.png differ
diff --git a/tests/Split/res/mipmap-xxhdpi/ic_app.png b/tests/Split/res/mipmap-xxhdpi/ic_app.png
new file mode 100644
index 0000000..b65532c
Binary files /dev/null and b/tests/Split/res/mipmap-xxhdpi/ic_app.png differ
diff --git a/tests/Split/res/mipmap-xxxhdpi/ic_app.png b/tests/Split/res/mipmap-xxxhdpi/ic_app.png
new file mode 100644
index 0000000..2679b49
Binary files /dev/null and b/tests/Split/res/mipmap-xxxhdpi/ic_app.png differ
diff --git a/tests/Split/src/java/com/android/example/split/ActivityMain.java b/tests/Split/src/java/com/android/example/split/ActivityMain.java
index a15fb3c..63963a2 100644
--- a/tests/Split/src/java/com/android/example/split/ActivityMain.java
+++ b/tests/Split/src/java/com/android/example/split/ActivityMain.java
@@ -24,8 +24,6 @@ public class ActivityMain extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        TextView text = new TextView(this);
-        text.setText(R.string.test);
-        setContentView(text);
+        setContentView(R.layout.main);
     }
 }
-- 
cgit v1.1