[android-scripting] push by rjmatthews62 - Fix npe in layout typefaces.... on 2012-06-04 22:12 GMT

[android-...@googlecode.com]

Revision: 97f6cfc2b03d
Author: rjmatthews62
Date: Mon Jun 4 15:11:50 2012
Log: Fix npe in layout typefaces.
Rebuilt template
http://code.google.com/p/android-scripting/source/detail?r=97f6cfc2b03d

Modified:

/android/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
/android/ScriptForAndroidTemplate/libs/script.jar
/android/ScriptingLayerForAndroid/AndroidManifest.xml
/android/script_for_android_template.zip

=======================================
---
/android/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
Sat Jun 2 00:28:01 2012
+++
/android/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
Mon Jun 4 15:11:50 2012
@@ -510,7 +510,8 @@
}
} else if (attr.equals("typeface")) {
TextView textview = (TextView) view;
- int style = textview.getTypeface().getStyle();
+ Typeface typeface = textview.getTypeface();
+ int style = typeface == null ? 0 : typeface.getStyle();
textview.setTypeface(Typeface.create(value, style));
} else if (attr.equals("src")) {
setImage(view, value);
=======================================
--- /android/ScriptForAndroidTemplate/libs/script.jar Sat Jun 2 00:28:01
2012
+++ /android/ScriptForAndroidTemplate/libs/script.jar Mon Jun 4 15:11:50
2012
Binary file, no diff available.
=======================================
--- /android/ScriptingLayerForAndroid/AndroidManifest.xml Sat Jun 2
00:28:01 2012
+++ /android/ScriptingLayerForAndroid/AndroidManifest.xml Mon Jun 4
15:11:50 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.googlecode.android_scripting" android:installLocation="auto"
- android:versionCode="519" android:versionName="5x19">
+ android:versionCode="521" android:versionName="5x21">
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission
android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
<uses-permission
android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
=======================================
--- /android/script_for_android_template.zip Sat Jun 2 00:28:01 2012
+++ /android/script_for_android_template.zip Mon Jun 4 15:11:50 2012
File is too large to display a diff.