am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '311a0f54ac95a1649474498748fff8327b0c917d':
  Fix layoutlib tests.
This commit is contained in:
Deepanshu Gupta
2015-03-24 23:54:58 +00:00
committed by Android Git Automerger
21 changed files with 97 additions and 37 deletions

View File

@ -3,7 +3,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.12.+' classpath 'com.android.tools.build:gradle:1.1.3'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -19,23 +19,21 @@ allprojects {
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 20 compileSdkVersion 21
buildToolsVersion '20' buildToolsVersion '21.1.2'
defaultConfig { defaultConfig {
applicationId 'com.android.layoutlib.test.myapplication' applicationId 'com.android.layoutlib.test.myapplication'
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 20 targetSdkVersion 21
versionCode 1 versionCode 1
versionName '1.0' versionName '1.0'
} }
buildTypes { buildTypes {
release { release {
runProguard false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
}
} }
dependencies { dependencies {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013 #Tue Mar 17 15:13:06 PDT 2015
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

View File

@ -1,13 +0,0 @@
package com.android.layoulib.test.myapplication;
import android.app.Application;
import android.test.ApplicationTestCase;
/**
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
*/
public class ApplicationTest extends ApplicationTestCase<Application> {
public ApplicationTest() {
super(Application.class);
}
}

View File

@ -0,0 +1,31 @@
package com.android.layoutlib.test.myapplication;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.CalendarView;
public class CustomCalendar extends CalendarView {
public CustomCalendar(Context context) {
super(context);
init();
}
public CustomCalendar(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public CustomCalendar(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public CustomCalendar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
private void init() {
setDate(871703200000L, false, true);
}
}

View File

@ -0,0 +1,31 @@
package com.android.layoutlib.test.myapplication;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.DatePicker;
public class CustomDate extends DatePicker {
public CustomDate(Context context) {
super(context);
init();
}
public CustomDate(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public CustomDate(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public CustomDate(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
private void init() {
init(2015, 0, 20, null);
}
}

View File

@ -1,17 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent" android:layout_width="match_parent"
android:columnCount="2"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Some text"/> android:text="Some text"/>
<DatePicker <Switch
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:checked="true"
android:layout_gravity="center"
/>
<com.android.layoutlib.test.myapplication.CustomDate
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp"/> android:layout_height="wrap_content"/>
<CalendarView <com.android.layoutlib.test.myapplication.CustomCalendar
android:layout_width="100dp" android:layout_width="200dp"
android:layout_height="100dp"/> android:layout_gravity="center_horizontal"
</LinearLayout> android:layout_height="200dp"/>
</GridLayout>

View File

@ -300,7 +300,8 @@ public class Main {
FolderConfiguration config = configGenerator.getFolderConfig(); FolderConfiguration config = configGenerator.getFolderConfig();
ResourceResolver resourceResolver = ResourceResolver resourceResolver =
ResourceResolver.create(mProjectResources.getConfiguredResources(config), ResourceResolver.create(mProjectResources.getConfiguredResources(config),
mFrameworkRepo.getConfiguredResources(config), "Theme.Material", false); mFrameworkRepo.getConfiguredResources(config),
"Theme.Material.Light.DarkActionBar", false);
return new SessionParams( return new SessionParams(
layoutParser, layoutParser,
@ -320,7 +321,7 @@ public class Main {
@Override @Override
public void warning(String tag, String message, Object data) { public void warning(String tag, String message, Object data) {
System.out.println("Warning " + tag + ": " + message); System.out.println("Warning " + tag + ": " + message);
fail(message); failWithMsg(message);
} }
@Override @Override
@ -330,13 +331,13 @@ public class Main {
if (throwable != null) { if (throwable != null) {
throwable.printStackTrace(); throwable.printStackTrace();
} }
fail(message); failWithMsg(message);
} }
@Override @Override
public void error(String tag, String message, Object data) { public void error(String tag, String message, Object data) {
System.out.println("Error " + tag + ": " + message); System.out.println("Error " + tag + ": " + message);
fail(message); failWithMsg(message);
} }
@Override @Override
@ -345,7 +346,7 @@ public class Main {
if (throwable != null) { if (throwable != null) {
throwable.printStackTrace(); throwable.printStackTrace();
} }
fail(message); failWithMsg(message);
} }
}; };
} }
@ -360,12 +361,12 @@ public class Main {
if (t != null) { if (t != null) {
t.printStackTrace(); t.printStackTrace();
} }
fail(String.format(msgFormat, args)); failWithMsg(msgFormat, args);
} }
@Override @Override
public void warning(String msgFormat, Object... args) { public void warning(String msgFormat, Object... args) {
fail(String.format(msgFormat, args)); failWithMsg(msgFormat, args);
} }
@Override @Override
@ -381,4 +382,8 @@ public class Main {
} }
return mLogger; return mLogger;
} }
private static void failWithMsg(String msgFormat, Object... args) {
fail(msgFormat == null || args == null ? "" : String.format(msgFormat, args));
}
} }